ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

overall code refactoring, comment improvement.

Browse Source
This commit is contained in:
Taylor Otwell
2011-06-17 00:02:24 -05:00
parent 5c275db6f4
commit 3408bb8492
10 changed files with 108 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
system/request.php
View File

@@ -2,13 +2,6 @@
class Request {
/**
* The request URI.
*
* @var string
*/
public static $uri;
/**
* Get the request URI.
*
@@ -16,14 +9,6 @@ class Request {
*/
public static function uri()
{
// -------------------------------------------------------
// If we have already determined the URI, return it.
// -------------------------------------------------------
if ( ! is_null(static::$uri))
{
return static::$uri;
}
// -------------------------------------------------------
// If the PATH_INFO is available, use it.
// -------------------------------------------------------
@@ -62,17 +47,15 @@ class Request {
}
// -------------------------------------------------------
// Remove the application index.
// Remove the application index and any extra slashes.
// -------------------------------------------------------
$uri = str_replace('/index.php', '', $uri);
$uri = trim($uri, '/');
$uri = trim(str_replace('/index.php', '', $uri), '/');
// -------------------------------------------------------
// If the requests is to the root of the application, we
// always return a single forward slash.
// -------------------------------------------------------
return static::$uri = ($uri == '') ? '/' : Str::lower($uri);
return ($uri == '') ? '/' : Str::lower($uri);
}
/**
@@ -86,7 +69,7 @@ class Request {
// The method can be spoofed using a POST variable, allowing HTML
// forms to simulate PUT and DELETE requests.
// --------------------------------------------------------------
return (isset($_POST['request_method'])) ? $_POST['request_method'] : $_SERVER['REQUEST_METHOD'];
return Arr::get($_POST, 'REQUEST_METHOD', $_SERVER['REQUEST_METHOD']);
}
/**