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

fixed problem with link() scheme

Browse Source
This commit is contained in:
seek3r 2001-01-08 19:23:54 +00:00
parent 97d92a6f69
commit b9a41b61c4
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
phpgwapi/inc/phpgw.inc.php
View File

@ -213,7 +213,6 @@
function link($url = "", $extravars = "") function link($url = "", $extravars = "")
{ {
global $phpgw, $phpgw_info, $usercookie, $kp3, $PHP_SELF; global $phpgw, $phpgw_info, $usercookie, $kp3, $PHP_SELF;
if (! $kp3) if (! $kp3)
$kp3 = $phpgw_info["user"]["kp3"]; $kp3 = $phpgw_info["user"]["kp3"];
@ -246,11 +245,15 @@
$slash_check = strtolower(substr($url ,0,1)); $slash_check = strtolower(substr($url ,0,1));
if(substr($url ,0,$webserver_url_count) != $phpgw_info["server"]["webserver_url"]) { if(substr($url ,0,$webserver_url_count) != $phpgw_info["server"]["webserver_url"]) {
if($slash_check != "/") { $app = $phpgw_info["flags"]["currentapp"];
$url = $phpgw_info["server"]["webserver_url"]."/".$url; if($slash_check == "/") {
} else{ $app = "";
$url = $phpgw_info["server"]["webserver_url"].$url; } elseif ($app == "home" || $app == "logout" || $app == "login"){
$app = "/";
}else{
$app = "/".$app."/";
} }
$url = $phpgw_info["server"]["webserver_url"].$app.$url;
} }
return $url; return $url;
} }