Merge pull request #201 from misol/back

되돌림
This commit is contained in:
MinSoo Kim 2016-02-03 22:08:17 +09:00
commit d4c3e467c9

View file

@ -24,12 +24,12 @@ class memberAdminController extends member
// if(Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request"); // if(Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request");
// Extract the necessary information in advance // Extract the necessary information in advance
$logged_info = Context::get('logged_info'); $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'); return new Object(-1, 'msg_invalid_request');
} }
$args = new stdClass; $args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing','allow_message','denied','is_admin','description','group_srl_list','limit_date');
$oMemberModel = &getModel ('member'); $oMemberModel = &getModel ('member');
$config = $oMemberModel->getMemberConfig (); $config = $oMemberModel->getMemberConfig ();
$getVars = array(); $getVars = array();
@ -47,7 +47,7 @@ class memberAdminController extends member
{ {
$args->{$val} = Context::get($val); $args->{$val} = Context::get($val);
} }
$args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing', 'allow_message', 'denied', 'is_admin', 'description', 'group_srl_list', 'limit_date'); $args->member_srl = Context::get('member_srl');
if(Context::get('reset_password')) if(Context::get('reset_password'))
$args->password = Context::get('reset_password'); $args->password = Context::get('reset_password');
else unset($args->password); else unset($args->password);