fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-12 05:22:35 +09:00
Code Issues Projects Releases Packages Wiki Activity

rollback r10201

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10233 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2012-02-28 05:48:23 +00:00
parent 1bae812afb
commit 3e33d362af
2 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/member/member.admin.controller.php
View file

@ -238,7 +238,7 @@
function _createSignupRuleset($signupForm, $agreement = null){ function _createSignupRuleset($signupForm, $agreement = null){
$xml_file = './files/ruleset/insertMember.xml'; $xml_file = './files/ruleset/insertMember.xml';
$buff = '<?xml version="1.0" encoding="utf-8"?>' $buff = '<?xml version="1.0" encoding="utf-8"?>' . PHP_EOL
.'<ruleset version="1.5.0">' .'<ruleset version="1.5.0">'
.'<customrules>' .'<customrules>'
.'</customrules>' .'</customrules>'

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

@ -1109,19 +1109,7 @@
// Display a message if no answer is entered // Display a message if no answer is entered
if (!$member_info->find_account_question || !$member_info->find_account_answer) return new Object(-1, 'msg_question_not_exists'); if (!$member_info->find_account_question || !$member_info->find_account_answer) return new Object(-1, 'msg_question_not_exists');
$member_info->find_account_answer = trim($member_info->find_account_answer); if(trim($member_info->find_account_question) != $find_account_question || trim($member_info->find_account_answer) != $find_account_answer) return new Object(-1, 'msg_answer_not_matches');
if(trim($member_info->find_account_question) != $find_account_question || $member_info->find_account_answer != $find_account_answer || $member_info->find_account_answer != md5($find_account_answer))
{
return new Object(-1, 'msg_answer_not_matches');
}
// change to md5
if($member_info->find_account_answer == $find_account_answer)
{
$args->member_srl = $member_srl;
$args->find_account_answer = md5($member_info->find_account_answer);
executeQuery('member.updateMemberFindQuesionAnswer', $args);
}
if ($config->identifier == 'email_address'){ if ($config->identifier == 'email_address'){
$user_id = $email_address; $user_id = $email_address;