Changeset 569

Timestamp:

09/25/2007 09:39:06 AM (14 months ago)

Author:

Shadowhand

Message:

• Updated Router to handle blank segments better
  
• Updated URI to have an rsegment() function
  

Location:

trunk/system/libraries

Files:

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

trunk/system/libraries/Router.php

@@ -148 +148 @@
                 }
 
-                if ($default_route == TRUE)
-                {
-                        self::$segments = '';
-                }
-
-                /**
-                 * Explode the segments by slashes
-                 */
-                self::$segments  = explode('/', self::$segments);
+                // Explode the segments by slashes
+                if ($default_route == TRUE OR self::$segments == '')
+                {
+                        self::$segments = array();
+                }
+                else
+                {
+                        self::$segments = explode('/', self::$segments);
+                }
+                // Routed segments will never be blank
                 self::$rsegments = explode('/', self::$rsegments);
 
-                /**
-                 * Validate segments to prevent malicious characters
-                 */
+                // Validate segments to prevent malicious characters
                 if ( ! empty(self::$segments))
                 {
@@ -170 +169 @@
                 }
 
-                /**
-                 * Yah, routed segments too, even though it should never happen
-                 */
+                // Yah, routed segments too, even though it should never happen
                 if ( ! empty(self::$rsegments))
                 {
@@ -181 +178 @@
                 }
 
-                /**
-                 * Prepare for Controller search
-                 */
+                // Prepare for Controller search
                 self::$directory  = '';
                 self::$controller = '';

trunk/system/libraries/URI.php

@@ -16 +16 @@
 
                 return isset(self::$segments[$index]) ? self::$segments[$index] : $default;
+        }
+
+        /**
+         * Retrieve a specific routed URI segment
+         *
+         * @access      public
+         * @param       int
+         * @param       mixed
+         * @return      mixed
+         */
+        public function rsegment($index = 1, $default = FALSE)
+        {
+                $index = (int) $index - 1;
+
+                return isset(self::$rsegments[$index]) ? self::$rsegments[$index] : $default;
         }