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

fixed instance selection by server-name to additionally find instance names containing only the domain-part (eg. www.domain.com matches instance domain.com, if no www.domain.com instance exists)

Browse Source
This commit is contained in:
Ralf Becker 2007-10-11 11:45:27 +00:00
parent d31652ed35
commit 1629343f47
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
phpgwapi/inc/functions.inc.php
View File

@ -117,15 +117,26 @@
if (!isset($GLOBALS['egw_info']['server']['default_domain']) || // allow to overwrite the default domain if (!isset($GLOBALS['egw_info']['server']['default_domain']) || // allow to overwrite the default domain
!isset($GLOBALS['egw_domain'][$GLOBALS['egw_info']['server']['default_domain']])) !isset($GLOBALS['egw_domain'][$GLOBALS['egw_info']['server']['default_domain']]))
{ {
if(isset($GLOBALS['egw_domain'][$_SERVER['SERVER_NAME']])) if(isset($GLOBALS['egw_domain'][$_SERVER['SERVER_NAME']]))
{ {
$GLOBALS['egw_info']['server']['default_domain'] = $_SERVER['SERVER_NAME']; $GLOBALS['egw_info']['server']['default_domain'] = $_SERVER['SERVER_NAME'];
} }
else else
{ {
reset($GLOBALS['egw_domain']); $domain_part = explode('.',$_SERVER['SERVER_NAME']);
list($GLOBALS['egw_info']['server']['default_domain']) = each($GLOBALS['egw_domain']); array_shift($domain_part);
$domain_part = implode('.',$domain_part);
if(isset($GLOBALS['egw_domain'][$domain_part]))
{
$GLOBALS['egw_info']['server']['default_domain'] = $domain_part;
}
else
{
reset($GLOBALS['egw_domain']);
list($GLOBALS['egw_info']['server']['default_domain']) = each($GLOBALS['egw_domain']);
}
unset($domain_part);
} }
} }
if (isset($_POST['login'])) // on login if (isset($_POST['login'])) // on login