Refactor the request class.
This commit is contained in:
@@ -29,15 +29,11 @@ class Request {
|
|||||||
|
|
||||||
$uri = static::raw_uri();
|
$uri = static::raw_uri();
|
||||||
|
|
||||||
if (strpos($uri, $base = parse_url(Config::get('application.url'), PHP_URL_PATH)) === 0)
|
$base = parse_url(Config::get('application.url'), PHP_URL_PATH);
|
||||||
{
|
|
||||||
$uri = substr($uri, strlen($base));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (strpos($uri, $index = '/index.php') === 0)
|
if (strpos($uri, $base) === 0) $uri = substr($uri, strlen($base));
|
||||||
{
|
|
||||||
$uri = substr($uri, strlen($index));
|
if (strpos($uri, $index = '/index.php') === 0) $uri = substr($uri, strlen($index));
|
||||||
}
|
|
||||||
|
|
||||||
return static::$uri = (($uri = trim($uri, '/')) == '') ? '/' : $uri;
|
return static::$uri = (($uri = trim($uri, '/')) == '') ? '/' : $uri;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user