X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=1566399fa2f351e8381796397d0f697b5b4e617f;hb=f519858044a627e99244b334b7bef3f7f96fa317;hp=850208c9d1501a80337a7a8d568a85aa88100527;hpb=25198a8d4cee5b2182f1ecb99192a4108a01afa4;p=quix0rs-gnu-social.git diff --git a/index.php b/index.php index 850208c9d1..1566399fa2 100644 --- a/index.php +++ b/index.php @@ -49,21 +49,29 @@ $action = null; function getPath($req) { + $p = null; + if ((common_config('site', 'fancy') || !array_key_exists('PATH_INFO', $_SERVER)) && array_key_exists('p', $req) ) { - return $req['p']; + $p = $req['p']; } else if (array_key_exists('PATH_INFO', $_SERVER)) { $path = $_SERVER['PATH_INFO']; $script = $_SERVER['SCRIPT_NAME']; if (substr($path, 0, mb_strlen($script)) == $script) { - return substr($path, mb_strlen($script)); + $p = substr($path, mb_strlen($script) + 1); } else { - return $path; + $p = $path; } } else { - return null; + $p = null; } + + // Trim all initial '/' + + $p = ltrim($p, '/'); + + return $p; } /**