From 1ea213f903d2ea2277e024fdfeb155a6a10e7646 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 15 Aug 2006 03:15:55 +0000 Subject: [PATCH] allow users with identical names as groups (LDAP) to login, thanks to Jan Lindemann --- phpgwapi/inc/class.sessions.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpgwapi/inc/class.sessions.inc.php b/phpgwapi/inc/class.sessions.inc.php index 9a0725c276..6622906eb1 100644 --- a/phpgwapi/inc/class.sessions.inc.php +++ b/phpgwapi/inc/class.sessions.inc.php @@ -510,7 +510,7 @@ //echo "

session::create(login='$login'): lid='$this->account_lid', domain='$this->account_domain'

\n"; $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 $GLOBALS['egw_info']['server']['global_denied_users'][$this->account_lid] || @@ -733,7 +733,7 @@ $GLOBALS['egw_info']['flags'] = $phpgw_info_flags; $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) { @@ -869,7 +869,7 @@ 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']->interserver->serverid = $this->account_id;