mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-24 08:53:37 +01:00
fixed domain-selection via url
This commit is contained in:
parent
c7683e5dbc
commit
2a05447886
@ -384,7 +384,7 @@
|
||||
if(!$GLOBALS['egw_info']['server']['show_domain_selectbox'])
|
||||
{
|
||||
/* 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)
|
||||
|
@ -64,5 +64,5 @@
|
||||
$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']);
|
||||
?>
|
||||
|
@ -107,7 +107,7 @@
|
||||
}
|
||||
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']]))
|
||||
|
Loading…
Reference in New Issue
Block a user