Changeset 1539

Timestamp:

12/14/2007 05:41:26 PM (10 months ago)

Author:

Shadowhand

Message:

Updates to Router/URI:

• Remove Router::$query_string setup routine from URI::construct
  
• Re-enabled the GET key optimization
  

Location:

trunk/system/libraries

Files:

• Router.php (modified) (3 diffs)
• URI.php (modified) (1 diff)

trunk/system/libraries/Router.php

@@ -50 +50 @@
                 {
                         // Set the query string to the current query string
-                        self::$query_string = $_SERVER['QUERY_STRING'];
+                        self::$query_string = trim($_SERVER['QUERY_STRING'], '&');
                 }
 
@@ -202 +202 @@
                         }
                 }
-                elseif (isset($_SERVER['PATH_INFO']) AND $_SERVER['PATH_INFO'])
-                {
-                        self::$current_uri = $_SERVER['PATH_INFO'];
-                }
-                elseif (isset($_SERVER['ORIG_PATH_INFO']) AND $_SERVER['ORIG_PATH_INFO'])
-                {
-                        self::$current_uri = $_SERVER['ORIG_PATH_INFO'];
-                }
-                elseif (isset($_SERVER['PHP_SELF']) AND $_SERVER['PHP_SELF'])
-                {
-                        self::$current_uri = $_SERVER['PHP_SELF'];
-                }
-                elseif (count($_GET) === 1 AND current($_GET) == '')
-                {
-                        self::$current_uri = current(array_keys($_GET));
+                elseif (count($_GET) === 1 AND current($_GET) == '' AND substr($_SERVER['QUERY_STRING'], -1) !== '=')
+                {
+                        // The URI is the array key, eg: ?this/is/the/uri
+                        self::$current_uri = key($_GET);
 
                         // Fixes really strange handling of a suffix in a GET string
@@ -226 +215 @@
                         // Destroy GET
                         $_GET = array();
+                        $_SERVER['QUERY_STRING'] = '';
+                }
+                elseif (isset($_SERVER['PATH_INFO']) AND $_SERVER['PATH_INFO'])
+                {
+                        self::$current_uri = $_SERVER['PATH_INFO'];
+                }
+                elseif (isset($_SERVER['ORIG_PATH_INFO']) AND $_SERVER['ORIG_PATH_INFO'])
+                {
+                        self::$current_uri = $_SERVER['ORIG_PATH_INFO'];
+                }
+                elseif (isset($_SERVER['PHP_SELF']) AND $_SERVER['PHP_SELF'])
+                {
+                        self::$current_uri = $_SERVER['PHP_SELF'];
                 }
 

trunk/system/libraries/URI.php

@@ -11 +11 @@
 
         /**
-         * Constructor: __construct
-         *  Detects current query string.
+         * Constructor.
          */
         public function __construct()
         {
-                if ( ! empty($_GET))
-                {
-                        self::$query_string = '?';
-
-                        foreach($_GET as $key => $val)
-                        {
-                                if (is_array($val))
-                                {
-                                        foreach($val as $sub_key => $sub_val)
-                                        {
-                                                // Integer subkeys are numerically indexed arrays
-                                                $sub_key = is_int($sub_key) ? '[]' : '['.$sub_key.']';
-
-                                                self::$query_string .= $key.rawurlencode($sub_key).'='.rawurlencode($sub_val).'&';
-                                        }
-                                }
-                                else
-                                {
-                                        self::$query_string .= $key.'='.rawurlencode($val).'&';
-                                }
-                        }
-
-                        // Remove the ending ampersand
-                        self::$query_string = rtrim(self::$query_string, '&');
-                }
+                Log::add('debug', 'URI library initialized.');
         }