fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-31 17:19:59 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 390 fixed member password in extra_vars

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9531 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2011-10-10 09:09:01 +00:00
parent 7ee41a75bd
commit 2a504ff53d
1 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

62
modules/member/member.controller.php
View file

@ -18,44 +18,44 @@
* @brief Log-in by checking user_id and password * @brief Log-in by checking user_id and password
**/ **/
function procMemberLogin($user_id = null, $password = null, $keep_signed = null) { function procMemberLogin($user_id = null, $password = null, $keep_signed = null) {
// Variables // Variables
if(!$user_id) $user_id = Context::get('user_id'); if(!$user_id) $user_id = Context::get('user_id');
$user_id = trim($user_id); $user_id = trim($user_id);
if(!$password) $password = Context::get('password'); if(!$password) $password = Context::get('password');
$password = trim($password); $password = trim($password);
if(!$keep_signed) $keep_signed = Context::get('keep_signed'); if(!$keep_signed) $keep_signed = Context::get('keep_signed');
// Return an error when id and password doesn't exist // Return an error when id and password doesn't exist
if(!$user_id) return new Object(-1,'null_user_id'); if(!$user_id) return new Object(-1,'null_user_id');
if(!$password) return new Object(-1,'null_password'); if(!$password) return new Object(-1,'null_password');
$output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false); $output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false);
if (!$output->toBool()) return $output; if (!$output->toBool()) return $output;
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member'); $config = $oModuleModel->getModuleConfig('member');
if($config->after_login_url) $this->setRedirectUrl($config->after_login_url); if($config->after_login_url) $this->setRedirectUrl($config->after_login_url);
// Check change_password_date // Check change_password_date
$limit_date = $config->change_password_date; $limit_date = $config->change_password_date;
// Check if change_password_date is set // Check if change_password_date is set
if ($limit_date > 0) { if ($limit_date > 0) {
$oMemberModel = &getModel('member'); $oMemberModel = &getModel('member');
//$member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList); //$member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList);
if ($this->memberInfo->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day'))) { if ($this->memberInfo->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day'))) {
$this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword')); $this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword'));
} }
} }
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', ''); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return; return;
} }
return $output; return $output;
} }
/** /**
@ -508,6 +508,7 @@
unset($all_args->body); unset($all_args->body);
unset($all_args->accept_agreement); unset($all_args->accept_agreement);
unset($all_args->signature); unset($all_args->signature);
unset($all_args->password);
unset($all_args->password2); unset($all_args->password2);
unset($all_args->mid); unset($all_args->mid);
unset($all_args->error_return_url); unset($all_args->error_return_url);
@ -603,6 +604,7 @@
unset($all_args->mid); unset($all_args->mid);
unset($all_args->error_return_url); unset($all_args->error_return_url);
unset($all_args->ruleset); unset($all_args->ruleset);
unset($all_args->password);
// Add extra vars after excluding necessary information from all the requested arguments // Add extra vars after excluding necessary information from all the requested arguments
$extra_vars = delObjectVars($all_args, $args); $extra_vars = delObjectVars($all_args, $args);