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

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

Browse Source
This commit is contained in:
Ralf Becker 2010-11-12 09:13:54 +00:00
parent 92ebc10cef
commit a66cb42789
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpgwapi/inc/class.egw.inc.php
View File

@ -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)
{ {