From 79955b083c76b53e7bd85b659de761eee4ce3034 Mon Sep 17 00:00:00 2001 From: MinSoo Kim Date: Wed, 27 Jan 2016 13:32:02 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=84=EC=A0=95=20=EA=B1=B0=EB=B6=80=20?= =?UTF-8?q?=EC=82=AC=EC=9C=A0=EB=A5=BC=20extra=5Fvars=20=EC=97=90=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 계정 거부된 회원이 로그인을 시도할 경우, 거부 사유와 함께 오류 메시지가 나타납니다. https://github.com/rhymix/rhymix/issues/58 --- modules/member/lang/lang.xml | 8 +++++ modules/member/member.admin.controller.php | 6 ++-- modules/member/member.controller.php | 2 +- modules/member/tpl/insert_member.html | 35 ++++++++++++++++++---- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/modules/member/lang/lang.xml b/modules/member/lang/lang.xml index 1c541ec03..4d9aff4b2 100644 --- a/modules/member/lang/lang.xml +++ b/modules/member/lang/lang.xml @@ -2665,6 +2665,14 @@ + + + + + + + + diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php index b6a89a27e..c844f636d 100644 --- a/modules/member/member.admin.controller.php +++ b/modules/member/member.admin.controller.php @@ -24,12 +24,12 @@ class memberAdminController extends member // if(Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request"); // Extract the necessary information in advance $logged_info = Context::get('logged_info'); - if($logged_info->is_admin != 'Y' || !checkCSRF()) + if($logged_info->is_admin !== 'Y' || !checkCSRF()) { return new Object(-1, 'msg_invalid_request'); } - $args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing','allow_message','denied','is_admin','description','group_srl_list','limit_date'); + $args = new stdClass; $oMemberModel = &getModel ('member'); $config = $oMemberModel->getMemberConfig (); $getVars = array(); @@ -47,7 +47,7 @@ class memberAdminController extends member { $args->{$val} = Context::get($val); } - $args->member_srl = Context::get('member_srl'); + $args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing', 'allow_message', 'denied', 'is_admin', 'description', 'group_srl_list', 'limit_date'); if(Context::get('reset_password')) $args->password = Context::get('reset_password'); else unset($args->password); diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index dead10f27..e2f1e2de7 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1751,7 +1751,7 @@ class memberController extends member $redirectUrl = getUrl('', 'act', 'dispMemberResendAuthMail'); return $this->setRedirectUrl($redirectUrl, new Object(-1,'msg_user_not_confirmed')); } - return new Object(-1,'msg_user_denied'); + return new Object(-1, ($this->memberInfo->refused_reason)? Context::getLang('msg_user_denied') . "\n" . $this->memberInfo->refused_reason : '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(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d"))); diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html index 37f31505a..e8f5245ed 100644 --- a/modules/member/tpl/insert_member.html +++ b/modules/member/tpl/insert_member.html @@ -77,6 +77,13 @@ +
+ +
+ + {$lang->about_refused_reason} +
+
@@ -116,16 +123,32 @@