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

Fix incorrectly merged file

Browse source
This commit is contained in:
Kijin Sung 2017-08-16 22:52:56 +09:00
parent ac953cc216
commit 224410c857
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1261,11 +1261,7 @@ class memberController extends member
} }
// Update to a temporary password and set change_password_date to 1 // Update to a temporary password and set change_password_date to 1
<<<<<<< HEAD
$temp_password = Rhymix\Framework\Password::getRandomPassword(8); $temp_password = Rhymix\Framework\Password::getRandomPassword(8);
=======
$temp_password = $oPassword->createTemporaryPassword(8);
>>>>>>> 3177f45... #2062 비밀번호 찾기 질문/답변을 본인만 확인/수정할 수 있도록 변경
$args = new stdClass(); $args = new stdClass();
$args->member_srl = $member_srl; $args->member_srl = $member_srl;
@ -2544,26 +2540,25 @@ class memberController extends member
{ {
$args->password = $orgMemberInfo->password; $args->password = $orgMemberInfo->password;
} }
<<<<<<< HEAD
======= if($args->find_account_answer)
{
if($args->find_account_answer) {
$args->find_account_answer = $oMemberModel->hashPassword($args->find_account_answer); $args->find_account_answer = $oMemberModel->hashPassword($args->find_account_answer);
} }
else else
{ {
$oPassword = new Password(); $oPassword = New Password();
$hashed = $oPassword->checkAlgorithm($orgMemberInfo->find_account_answer); $hashed = $oPassword->checkAlgorithm($orgMemberInfo->find_account_answer);
if($hashed)
if($hashed) { {
$args->find_account_answer = $orgMemberInfo->find_account_answer; $args->find_account_answer = $orgMemberInfo->find_account_answer;
} else { }
else
{
$args->find_account_answer = $oPassword->createHash($orgMemberInfo->find_account_answer); $args->find_account_answer = $oPassword->createHash($orgMemberInfo->find_account_answer);
} }
} }
>>>>>>> 3177f45... #2062 비밀번호 찾기 질문/답변을 본인만 확인/수정할 수 있도록 변경
if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name; if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id; if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name; if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;