summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/helpers/inflector_helper.php4
-rw-r--r--system/libraries/Router.php138
2 files changed, 106 insertions, 36 deletions
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index 3bded708e..3d8d3e0ca 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -31,7 +31,7 @@
/**
* Singular
*
- * Takes a plural word and makes it singular
+ * Takes a singular word and makes it plural
*
* @access public
* @param string
@@ -64,7 +64,7 @@ function singular($str)
/**
* Plural
*
- * Takes a singular word and makes it plural
+ * Takes a plural word and makes it singular
*
* @access public
* @param string
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 868fd909e..5bbf9e6ca 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -77,45 +77,18 @@ class CI_Router {
return;
}
-
- // Load the routes.php file
+
+ // Load the routes.php file and set the default controller
@include_once(APPPATH.'config/routes'.EXT);
$this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route;
unset($route);
- // Set the default controller
- $this->default_controller = ( ! isset($this->routes['default_controller']) OR $this->routes['default_controller'] == '') ? FALSE : strtolower($this->routes['default_controller']);
-
- // Fetch the URI string Depending on the server,
- // the URI will be available in one of two globals
- if ($this->config->item('uri_protocol') == 'auto')
- {
- $path_info = getenv('PATH_INFO');
- if ($path_info != '' AND $path_info != "/".SELF)
- {
- $this->uri_string = $path_info;
- }
- else
- {
- $path_info = getenv('ORIG_PATH_INFO');
- if ($path_info != '' AND $path_info != "/".SELF)
- {
- $this->uri_string = $path_info;
- }
- else
- {
- $this->uri_string = getenv('QUERY_STRING');
- }
- }
- }
- else
- {
- $this->uri_string = getenv(strtoupper($this->config->item('uri_protocol')));
- }
-
+ $this->default_controller = ( ! isset($this->routes['default_controller']) OR $this->routes['default_controller'] == '') ? FALSE : strtolower($this->routes['default_controller']);
- // Is there a URI string? If not, the default controller specified
- // by the admin in the "routes" file will be shown.
+ // Get the URI string
+ $this->uri_string = $this->_get_uri_string();
+
+ // Is there a URI string? If not, the default controller specified in the "routes" file will be shown.
if ($this->uri_string == '')
{
if ($this->default_controller === FALSE)
@@ -301,6 +274,103 @@ class CI_Router {
// --------------------------------------------------------------------
/**
+ * Get the URI String
+ *
+ * @access private
+ * @return string
+ */
+ function _get_uri_string()
+ {
+ if (strtoupper($this->config->item('uri_protocol')) == 'AUTO')
+ {
+ $path_info = getenv('PATH_INFO');
+ if ($path_info != '' AND $path_info != "/".SELF)
+ {
+ return $path_info;
+ }
+ else
+ {
+ $req_uri = $this->_parse_request_uri();
+
+ if ($req_uri != "")
+ {
+ return $req_uri;
+ }
+ else
+ {
+ $path_info = getenv('ORIG_PATH_INFO');
+ if ($path_info != '' AND $path_info != "/".SELF)
+ {
+ return $path_info;
+ }
+ else
+ {
+ return getenv('QUERY_STRING');
+ }
+ }
+ }
+ }
+ else
+ {
+ $uri = strtoupper($this->config->item('uri_protocol'));
+
+ if ($uri == 'REQUEST_URI')
+ {
+ return $this->_parse_request_uri();
+ }
+
+ return getenv($uri);
+ }
+ }
+ // END _get_uri_string()
+
+ // --------------------------------------------------------------------
+
+ /**
+ * Parse the REQUEST_URI
+ *
+ * Due to the way REQUEST_URI works it usually contains path info
+ * that makes it unusable as URI data. We'll trim off the unnecessary
+ * data, hopefully arriving at a valid URI that we can use.
+ *
+ * @access private
+ * @return string
+ */
+ function _parse_request_uri()
+ {
+ $request_uri = getenv('REQUEST_URI');
+ $fc_path = FCPATH;
+
+ if (strpos($request_uri, '?') !== FALSE)
+ {
+ $fc_path .= '?';
+ }
+
+ $parsed_uri = explode("/", preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $request_uri)));
+
+ $i = 0;
+ foreach(explode("/", $fc_path) as $segment)
+ {
+ if ($segment == $parsed_uri[$i])
+ {
+ $i++;
+ }
+ }
+
+ $parsed_uri = implode("/", array_slice($parsed_uri, $i));
+
+ if ($parsed_uri != '')
+ {
+ $parsed_uri = '/'.$parsed_uri;
+ }
+
+ return $parsed_uri;
+ }
+ // END _parse_request_uri()
+
+ // --------------------------------------------------------------------
+
+ /**
* Filter segments for malicious characters
*
* @access private