fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4 from kijin/feature/userid-or-email

Browse source 
아이디 또는 메일 주소로 로그인할 수 있도록 허용
This commit is contained in:
CONORY 2015-12-18 14:27:01 +09:00
commit 550c8739e6
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -561,7 +561,7 @@ class memberAdminController extends member
'</ruleset>';
$fields = array();
$trans = array('email_address'=>'email', 'user_id'=> 'userid');
$trans = array('email_address'=>'email', 'user_id'=> '');
$fields[] = sprintf('<field name="user_id" required="true" rule="%s"/>', $trans[$identifier]);
$fields[] = '<field name="password" required="true" />';

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

@ -1695,7 +1695,7 @@ class memberController extends member
$args->ipaddress = $_SERVER['REMOTE_ADDR'];
// check identifier
if($config->identifier == 'email_address')
if($config->identifier == 'email_address' || strpos($user_id, '@') !== false)
{
// Get user_id information
$this->memberInfo = $oMemberModel->getMemberInfoByEmailAddress($user_id);