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

issue 1495 fixed keep login error with email_address identifier type

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10250 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-02-28 09:30:16 +00:00
parent dc453b7ffc
commit 0f2b468f46
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1446,15 +1446,20 @@
return;
}
$user_id = $output->data->user_id;
$oMemberModel = &getModel('member');
$config = $oMemberModel->getMemberConfig();
$user_id = ($config->identifier == 'user_id') ? $output->data->user_id : $output->data->email_address;
$password = $output->data->password;
if(!$user_id || !$password) {
if(!$user_id || !$password) {
setCookie('xeak',null,time()+60*60*24*365, '/');
return;
}
$do_auto_login = false;
// Compare key values based on the information
$key = md5($user_id . $password . $_SERVER['HTTP_USER_AGENT']);

1
modules/member/queries/getAutologin.xml
View file

@ -4,6 +4,7 @@
<table name="member_autologin" alias="member_autologin" />
</tables>
<columns>
<column name="member.email_address" alias="email_address" />
<column name="member.user_id" alias="user_id" />
<column name="member.password" alias="password" />
<column name="member_autologin.autologin_key" alias="autologin_key" />