extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-09 01:25:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

"get WebDAV working again after the last change in the session class:

Browse Source 
we can NOT clean the whole egw_info/server array, as this also cleans the variables set in the header, which get not re-read
--> we need to keep the important values: sessions_type and default_domain"
This commit is contained in:
Ralf Becker 2007-04-07 09:44:39 +00:00
parent a95813bd5d
commit 54e479c408
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -557,12 +557,20 @@
$now = time(); $now = time();
/* This is to ensure that we authenticate to the correct domain (might not be default) */ /* This is to ensure that we authenticate to the correct domain (might not be default) */
if($this->account_domain != $GLOBALS['egw_info']['user']['domain']) // if no domain is given we use the default domain, so we dont need to re-create everything
if (!$GLOBALS['egw_info']['user']['domain'] && $this->account_domain == $GLOBALS['egw_info']['server']['default_domain'])
{
$GLOBALS['egw_info']['user']['domain'] = $this->account_domain;
}
elseif($this->account_domain != $GLOBALS['egw_info']['user']['domain'])
{ {
$GLOBALS['egw']->ADOdb = null; $GLOBALS['egw']->ADOdb = null;
$GLOBALS['egw_info']['user']['domain'] = $this->account_domain; $GLOBALS['egw_info']['user']['domain'] = $this->account_domain;
// reset the db all other phpgwapi data // reset the db and all other (non-header!) egw_info/server data
$GLOBALS['egw_info']['server'] = array(); $GLOBALS['egw_info']['server'] = array(
'sessions_type' => $GLOBALS['egw_info']['server']['sessions_type'],
'default_domain' => $GLOBALS['egw_info']['server']['default_domain'],
);
$GLOBALS['egw_info']['server']['db_host'] = $GLOBALS['egw_domain'][$this->account_domain]['db_host']; $GLOBALS['egw_info']['server']['db_host'] = $GLOBALS['egw_domain'][$this->account_domain]['db_host'];
$GLOBALS['egw_info']['server']['db_port'] = $GLOBALS['egw_domain'][$this->account_domain]['db_port']; $GLOBALS['egw_info']['server']['db_port'] = $GLOBALS['egw_domain'][$this->account_domain]['db_port'];
$GLOBALS['egw_info']['server']['db_name'] = $GLOBALS['egw_domain'][$this->account_domain]['db_name']; $GLOBALS['egw_info']['server']['db_name'] = $GLOBALS['egw_domain'][$this->account_domain]['db_name'];