Changeset 2310

Timestamp:

03/17/2008 04:40:35 AM (7 months ago)

Author:

Geert

Message:

Fixed #496 and some other small optimizations and cleanups.

Location:

trunk/system/libraries

Files:

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

trunk/system/libraries/Router.php

@@ -29 +29 @@
         /**
          * Router setup routine. Automatically called during Kohana setup process.
+         *
+         * @return  void
          */
         public static function setup()
@@ -39 +41 @@
 
                 // Use the default route when no segments exist
-                if (self::$current_uri == '' OR self::$current_uri == '/')
-                {
-                        self::$current_uri = self::$routes['_default'];
+                if (self::$current_uri === '')
+                {
+                        self::$current_uri = trim(self::$routes['_default'], '/');
                         $default_route = TRUE;
                 }
@@ -62 +64 @@
 
                 // Custom routing
-                if ($default_route == FALSE AND count(self::$routes) > 1)
+                if ($default_route === FALSE AND count(self::$routes) > 1)
                 {
                         if (isset(self::$routes[self::$current_uri]))
@@ -75 +77 @@
                                 {
                                         if ($key === '_default') continue;
+
+                                        // Trim slashes
+                                        $key = trim($key, '/');
+                                        $val = trim($val, '/');
 
                                         // Does this route match the current URI?
@@ -96 +102 @@
 
                         // Check router one more time to do some magic
-                        self::$rsegments = isset(self::$routes[self::$rsegments]) ? self::$routes[self::$rsegments] : self::$rsegments;
+                        if (isset(self::$routes[self::$rsegments]))
+                        {
+                                self::$rsegments = self::$routes[self::$rsegments];
+                        }
                 }
 
                 // Explode the segments by slashes
-                if ($default_route == TRUE OR self::$segments == '')
+                if ($default_route === TRUE OR self::$segments === '')
                 {
                         self::$segments = array();
@@ -108 +117 @@
                         self::$segments = explode('/', self::$segments);
                 }
+
                 // Routed segments will never be blank
                 self::$rsegments = explode('/', self::$rsegments);
@@ -178 +188 @@
         /**
          * Attempts to determine the current URI using CLI, GET, PATH_INFO, ORIG_PATH_INFO, or PHP_SELF.
+         *
+         * @return  void
          */
         public static function find_uri()
@@ -269 +281 @@
                 $str = trim($str);
 
-                if ($str != '' AND ($allowed = Config::item('routes._allowed')) != '')
+                if ($str !== '' AND ($allowed = Config::item('routes._allowed')) != '')
                 {
                         if ( ! preg_match('|^['.preg_quote($allowed).']++$|iuD', $str))

trunk/system/libraries/URI.php

@@ -237 +237 @@
                 return self::$rsegments[$end - 1];
         }
-        
-        /** 
-         * Returns the path to the current controller (not including the actual 
-         * controller), as a web path
-         * 
-         * @param  bool    If a full url should be returned, or only the path specifically
-         */
-        public function controller_path($full = TRUE) {
-                return ((bool) $full) 
-                        ? url::site(self::$controller_path)
-                        : self::$controller_path;
-        }
-        
-        /** 
-         * Returns the current controller, as a web path 
-         * 
-         * @param  bool    If a full url should be returned, or only the controller specifically
-         */
-        public function controller($full = TRUE) {
-                return ((bool) $full) 
-                        ? url::site(self::$controller_path.self::$controller)
-                        : self::$controller;
-        }
-        
-        /** 
-         * Returns the current method, as a web path
-         * 
-         * @param  bool    If a full url should be returned, or only the method specifically
-         */
-        public function method($full = TRUE) {
-                return ((bool) $full) 
-                        ? url::site(self::$controller_path.self::$controller.'/'.self::$method) 
-                        : self::$method;
+
+        /**
+         * Returns the path to the current controller (not including the actual
+         * controller), as a web path.
+         *
+         * @param   boolean  return a full url, or only the path specifically
+         * @return  string
+         */
+        public function controller_path($full = TRUE)
+        {
+                return ($full) ? url::site(self::$controller_path) : self::$controller_path;
+        }
+
+        /**
+         * Returns the current controller, as a web path.
+         *
+         * @param   boolean  return a full url, or only the controller specifically
+         * @return  string
+         */
+        public function controller($full = TRUE)
+        {
+                return ($full) ? url::site(self::$controller_path.self::$controller) : self::$controller;
+        }
+
+        /**
+         * Returns the current method, as a web path.
+         *
+         * @param   boolean  return a full url, or only the method specifically
+         * @return  string
+         */
+        public function method($full = TRUE)
+        {
+                return ($full) ? url::site(self::$controller_path.self::$controller.'/'.self::$method) : self::$method;
         }