Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved URI detection.

This commit is contained in:
Taylor Otwell 2011-06-16 07:22:49 -07:00
parent 9b9a880326
commit bd3b5f1800
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
system/request.php
View File

@ -42,8 +42,6 @@ public static function uri()
{ {
throw new \Exception("Malformed request URI. Request terminated."); throw new \Exception("Malformed request URI. Request terminated.");
} }
$uri = str_replace('/index.php', '', $uri);
} }
// ------------------------------------------------------- // -------------------------------------------------------
// Neither PATH_INFO or REQUEST_URI are available. // Neither PATH_INFO or REQUEST_URI are available.
@ -53,6 +51,21 @@ public static function uri()
throw new \Exception('Unable to determine the request URI.'); throw new \Exception('Unable to determine the request URI.');
} }
// -------------------------------------------------------
// Remove the application URL.
// -------------------------------------------------------
$base_url = parse_url(Config::get('application.url'), PHP_URL_PATH);
if (strpos($uri, $base_url) === 0)
{
$uri = (string) substr($uri, strlen($base_url));
}
// -------------------------------------------------------
// Remove the application index.
// -------------------------------------------------------
$uri = str_replace('/index.php', '', $uri);
$uri = trim($uri, '/'); $uri = trim($uri, '/');
// ------------------------------------------------------- // -------------------------------------------------------