extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed domain-selection via url

Browse Source
This commit is contained in:
Ralf Becker 2005-10-09 12:02:24 +00:00
parent c7683e5dbc
commit 2a05447886
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
login.php
View File

@ -384,7 +384,7 @@
if(!$GLOBALS['egw_info']['server']['show_domain_selectbox']) if(!$GLOBALS['egw_info']['server']['show_domain_selectbox'])
{ {
/* trick to make domain section disapear */ /* trick to make domain section disapear */
$tmpl->set_var('domain_selection',''); $tmpl->set_var('domain_selection','<input type="hidden" name="logindomain" value="'.htmlspecialchars($GLOBALS['egw_info']['user']['domain']).'" />');
} }
foreach($_GET as $name => $value) foreach($_GET as $name => $value)

2
logout.php
View File

@ -64,5 +64,5 @@
$GLOBALS['egw']->session->phpgw_setcookie(EGW_PHPSESSID); $GLOBALS['egw']->session->phpgw_setcookie(EGW_PHPSESSID);
} }
$GLOBALS['egw']->redirect($GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=1'); $GLOBALS['egw']->redirect($GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=1&domain='.$GLOBALS['egw_info']['user']['domain']);
?> ?>

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

@ -107,7 +107,7 @@
} }
else // on "normal" pageview else // on "normal" pageview
{ {
$GLOBALS['egw_info']['user']['domain'] = $_REQUEST['domain']; $GLOBALS['egw_info']['user']['domain'] = get_var('domain',array('GET','COOKIE'),false);
} }
if (@isset($GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']])) if (@isset($GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]))