fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-30 07:42:11 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'next' into feature/ckeditor

Browse source
This commit is contained in:
bnu 2015-02-24 20:48:20 +09:00
commit 95154d6985
18 changed files with 795 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1119,7 +1119,7 @@ class memberController extends member
}
else
{
$args->password = md5($output->data->new_password);
$args->password = getModel('member')->hashPassword($args->password);
unset($args->denied);
}
// Back up the value of $Output->data->is_register
@ -1974,7 +1974,7 @@ class memberController extends member
$message = Context::getLang('about_password_strength');
return new Object(-1, $message[$config->password_strength]);
}
$args->password = md5($args->password);
$args->password = $oMemberModel->hashPassword($args->password);
}
elseif(!$args->password) unset($args->password);
if($oMemberModel->isDeniedID($args->user_id)) return new Object(-1,'denied_user_id');
@ -2167,7 +2167,7 @@ class memberController extends member
return new Object(-1, $message[$config->password_strength]);
}
$args->password = md5($args->password);
$args->password = $oMemberModel->hashPassword($args->password);
}
else $args->password = $orgMemberInfo->password;
if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
@ -2257,14 +2257,7 @@ class memberController extends member
return new Object(-1, $message[$config->password_strength]);
}
if($this->useSha1)
{
$args->password = md5(sha1(md5($args->password)));
}
else
{
$args->password = md5($args->password);
}
$args->password = $oMemberModel->hashPassword($args->password);
}
else if($args->hashed_password)
{