extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-08 23:19:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

* API fix webserver_url of just a domain eg. http://domain.com gives PHP Warning empty delimiter ...

Browse Source
This commit is contained in:
Ralf Becker 2011-08-05 08:00:58 +00:00
parent dd89d6e8ec
commit 30f5025431
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,11 +310,11 @@ class egw extends egw_minimal
{ {
//echo "<p>account_callback='$account_callback', account=".print_r($account,true).", sessionid=$sessionid</p>\n"; exit; //echo "<p>account_callback='$account_callback', account=".print_r($account,true).", sessionid=$sessionid</p>\n"; exit;
// 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'] != '/' &&
($webserver_path = parse_url($GLOBALS['egw_info']['server']['webserver_url'],PHP_URL_PATH)) && $webserver_path != '/')
{ {
// we have to use only path component, to cope with domains like http://egroupware.domain.com and /egroupware // 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), list(,$relpath) = explode($webserver_path,parse_url($_SERVER['PHP_SELF'],PHP_URL_PATH),2);
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)
{ {