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

fix for multidomain-install without domain-selectbox

Browse Source
This commit is contained in:
Ralf Becker 2003-11-14 17:43:49 +00:00
parent 4290a272f0
commit ad48945359
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,8 @@
function split_login_domain($both,&$login,&$domain) function split_login_domain($both,&$login,&$domain)
{ {
$parts = explode('@',$both); $parts = explode('@',$both);
$domain = array_pop($parts); $domain = count($parts) > 1 ? array_pop($parts) :
$GLOBALS['phpgw_info']['server']['default_domain'];
$login = implode('@',$parts); $login = implode('@',$parts);
} }
@ -286,11 +287,6 @@
$this->split_login_domain($session['session_lid'],$this->account_lid,$this->account_domain); $this->split_login_domain($session['session_lid'],$this->account_lid,$this->account_domain);
if ($this->account_domain == '')
{
$this->account_domain = $GLOBALS['phpgw_info']['server']['default_domain'];
}
$GLOBALS['phpgw_info']['user']['kp3'] = $this->kp3; $GLOBALS['phpgw_info']['user']['kp3'] = $this->kp3;
$this->update_dla(); $this->update_dla();
@ -507,17 +503,12 @@
$now = time(); $now = time();
if (strstr($login,'@') === False)
{
$this->account_domain = $GLOBALS['phpgw_info']['server']['default_domain'];
}
//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();
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') $GLOBALS['phpgw']->accounts->get_type($this->account_lid) == 'g')
{ {
$this->reason = $blocked ? 'blocked, too many attempts' : 'bad login or password'; $this->reason = $blocked ? 'blocked, too many attempts' : 'bad login or password';