holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow users with identical names as groups (LDAP) to login, thanks to Jan Lindemann <jan-at-jannet.de>

Browse Source
This commit is contained in:
Ralf Becker 2006-08-15 03:15:55 +00:00
parent 8b199cf8e2
commit 1ea213f903
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -510,7 +510,7 @@
//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['egw']->accounts->name2id($this->account_lid); $this->account_id = $GLOBALS['egw']->accounts->name2id($this->account_lid,'account_lid','u');
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['egw_info']['server']['global_denied_users'][$this->account_lid] || $GLOBALS['egw_info']['server']['global_denied_users'][$this->account_lid] ||
@ -733,7 +733,7 @@
$GLOBALS['egw_info']['flags'] = $phpgw_info_flags; $GLOBALS['egw_info']['flags'] = $phpgw_info_flags;
$this->update_dla(); $this->update_dla();
$this->account_id = $GLOBALS['egw']->interserver->name2id($this->account_lid); $this->account_id = $GLOBALS['egw']->interserver->name2id($this->account_lid,'account_lid','u');
if (!$this->account_id) if (!$this->account_id)
{ {
@ -869,7 +869,7 @@
if (!$GLOBALS['egw']->interserver->exists($this->account_lid)) if (!$GLOBALS['egw']->interserver->exists($this->account_lid))
{ {
$this->account_id = $GLOBALS['egw']->interserver->name2id($this->account_lid); $this->account_id = $GLOBALS['egw']->interserver->name2id($this->account_lid,'account_lid','u');
} }
$GLOBALS['egw_info']['user']['account_id'] = $this->account_id; $GLOBALS['egw_info']['user']['account_id'] = $this->account_id;
$GLOBALS['egw']->interserver->serverid = $this->account_id; $GLOBALS['egw']->interserver->serverid = $this->account_id;