mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-23 00:13:35 +01:00
fixed not always working redirect after login: we have to use only path component, to cope with domains like http://egroupware.domain.com and /egroupware
This commit is contained in:
parent
92ebc10cef
commit
a66cb42789
@ -312,7 +312,9 @@ class egw extends egw_minimal
|
|||||||
// we forward to the same place after the re-login
|
// we forward to the same place after the re-login
|
||||||
if ($GLOBALS['egw_info']['server']['webserver_url'] && $GLOBALS['egw_info']['server']['webserver_url'] != '/')
|
if ($GLOBALS['egw_info']['server']['webserver_url'] && $GLOBALS['egw_info']['server']['webserver_url'] != '/')
|
||||||
{
|
{
|
||||||
list(,$relpath) = explode($GLOBALS['egw_info']['server']['webserver_url'],$_SERVER['PHP_SELF'],2);
|
// we have to use only path component, to cope with domains like http://egroupware.domain.com and /egroupware
|
||||||
|
list(,$relpath) = explode(parse_url($GLOBALS['egw_info']['server']['webserver_url'],PHP_URL_PATH),
|
||||||
|
parse_url($_SERVER['PHP_SELF'],PHP_URL_PATH),2);
|
||||||
}
|
}
|
||||||
else // the webserver-url is empty or just a slash '/' (eGW is installed in the docroot and no domain given)
|
else // the webserver-url is empty or just a slash '/' (eGW is installed in the docroot and no domain given)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user