From f99c25e60b90de6f2ff79c83344db9d5809351bd Mon Sep 17 00:00:00 2001 From: akasima Date: Tue, 8 Apr 2014 12:37:12 +0900 Subject: [PATCH] =?UTF-8?q?#541=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=ED=9B=84=20=EC=9D=B8=EC=A6=9D=20=EC=A0=9C=ED=95=9C=EC=9D=BC?= =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20=EA=B3=A0=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/member/lang/lang.xml | 6 ++++++ modules/member/member.admin.controller.php | 1 + modules/member/member.controller.php | 12 +++++++++--- modules/member/member.view.php | 11 ++++++++++- modules/member/skins/default/login_form.html | 6 +++--- modules/member/skins/default/signup_form.html | 4 ++-- modules/member/tpl/signup_config.html | 1 + 7 files changed, 32 insertions(+), 9 deletions(-) diff --git a/modules/member/lang/lang.xml b/modules/member/lang/lang.xml index dbd2fdccc..cffa82b47 100644 --- a/modules/member/lang/lang.xml +++ b/modules/member/lang/lang.xml @@ -509,6 +509,12 @@ + + + + + + diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index 9305d6ae0..d2b185872 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -184,6 +184,7 @@ class memberAdminController extends member $args = Context::gets( 'limit_day', + 'limit_day_description', 'agreement', 'redirect_url', 'profile_image', 'profile_image_max_width', 'profile_image_max_height', diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 68cc2bc81..646087fcf 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -370,11 +370,16 @@ class memberController extends member { if($config->identifier == 'email_address') { - $this->doLogin($args->email_address); + $output = $this->doLogin($args->email_address); } else { - $this->doLogin($args->user_id); + $output = $this->doLogin($args->user_id); + } + if(!$output->toBool()) { + if($output->error == -9) + $output->error = -11; + return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), $output); } } @@ -385,6 +390,7 @@ class memberController extends member { $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address); $this->setMessage($msg); + return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), new Object(-12, $msg)); } else $this->setMessage('success_registed'); // Call a trigger (after) @@ -1729,7 +1735,7 @@ class memberController extends member return new Object(-1,'msg_user_denied'); } // Notify if denied_date is less than the current time - if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) return new Object(-1,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d"))); + if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) return new Object(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d"))); // Update the latest login time $args->member_srl = $this->memberInfo->member_srl; $output = executeQuery('member.updateLastLogin', $args); diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 5287eb672..5c8c06e56 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -415,8 +415,17 @@ class memberView extends member $config = $this->member_config; Context::set('identifier', $config->identifier); + $XE_VALIDATOR_MESSAGE = Context::get('XE_VALIDATOR_MESSAGE'); + $XE_VALIDATOR_ERROR = Context::get('XE_VALIDATOR_ERROR'); + if($XE_VALIDATOR_ERROR == -11) + Context::set('XE_VALIDATOR_MESSAGE', $XE_VALIDATOR_MESSAGE . $config->limit_day_description); + + if($XE_VALIDATOR_ERROR < -10) + Context::set('referer_url', '/'); + else + Context::set('referer_url', htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); + // Set a template file - Context::set('referer_url', htmlspecialchars($_SERVER['HTTP_REFERER'], ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); $this->setTemplateFile('login_form'); } diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html index a80b5d382..c6a1c1f18 100644 --- a/modules/member/skins/default/login_form.html +++ b/modules/member/skins/default/login_form.html @@ -5,13 +5,13 @@

{$lang->cmd_login}