extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for bug [ 1022807 ] users with some login names can't login

Browse Source
This commit is contained in:
Ralf Becker 2004-09-08 13:16:54 +00:00
parent f22dab597d
commit 257251fe00
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpgwapi/inc/class.sessions.inc.php
View File

@ -471,11 +471,13 @@
//echo "<p>session::create(login='$login'): lid='$this->account_lid', domain='$this->account_domain'</p>\n"; //echo "<p>session::create(login='$login'): lid='$this->account_lid', domain='$this->account_domain'</p>\n";
$user_ip = $this->getuser_ip(); $user_ip = $this->getuser_ip();
$this->account_id = $GLOBALS['phpgw']->accounts->name2id($this->account_lid);
if (($blocked = $this->login_blocked($login,$user_ip)) || // too many unsuccessful attempts if (($blocked = $this->login_blocked($login,$user_ip)) || // too many unsuccessful attempts
$GLOBALS['phpgw_info']['server']['global_denied_users'][$this->account_lid] || $GLOBALS['phpgw_info']['server']['global_denied_users'][$this->account_lid] ||
!$GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd, $this->passwd_type) || !$GLOBALS['phpgw']->auth->authenticate($this->account_lid, $this->passwd, $this->passwd_type) ||
$GLOBALS['phpgw']->accounts->get_type($this->account_lid) == 'g') $this->account_id && $GLOBALS['phpgw']->accounts->get_type($this->account_id) == 'g')
{ {
$this->reason = $blocked ? 'blocked, too many attempts' : 'bad login or password'; $this->reason = $blocked ? 'blocked, too many attempts' : 'bad login or password';
$this->cd_reason = $blocked ? 99 : 5; $this->cd_reason = $blocked ? 99 : 5;
@ -484,14 +486,11 @@
return False; return False;
} }
if ((!$GLOBALS['phpgw']->accounts->exists($this->account_lid)) && $GLOBALS['phpgw_info']['server']['auto_create_acct'] == True) if (!$this->account_id && $GLOBALS['phpgw_info']['server']['auto_create_acct'] == True)
{ {
$this->account_id = $GLOBALS['phpgw']->accounts->auto_add($this->account_lid, $passwd); $this->account_id = $GLOBALS['phpgw']->accounts->auto_add($this->account_lid, $passwd);
} }
else
{
$this->account_id = $GLOBALS['phpgw']->accounts->name2id($this->account_lid);
}
$GLOBALS['phpgw_info']['user']['account_id'] = $this->account_id; $GLOBALS['phpgw_info']['user']['account_id'] = $this->account_id;
$GLOBALS['phpgw']->accounts->accounts($this->account_id); $GLOBALS['phpgw']->accounts->accounts($this->account_id);
$this->sessionid = $this->new_session_id(); $this->sessionid = $this->new_session_id();