Changeset 2182

Timestamp:

02/28/2008 10:34:02 AM (8 months ago)

Author:

gregmac

Message:

Added Router_Core::$controller_path, URI->controller_path(), URI->controller(), URI->method()

Location:

trunk/system/libraries

Files:

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

trunk/system/libraries/Router.php

@@ -21 +21 @@
         public static $url_suffix   = '';
 
-        public static $directory  = FALSE;
-        public static $controller = FALSE;
-        public static $method     = FALSE;
-        public static $arguments  = FALSE;
+        public static $directory       = FALSE;
+        public static $controller      = FALSE;
+        public static $controller_path = FALSE;
+        public static $method          = FALSE;
+        public static $arguments       = FALSE;
 
         /**
@@ -142 +143 @@
                         // Path to be added to as we search deeper
                         $search = 'controllers';
-
+                        
+                        // controller path to be added to as we search deeper
+                        $controller_path = '';
+                        
                         // Use the rsegments to find the controller
                         foreach(self::$rsegments as $key => $segment)
@@ -152 +156 @@
                                         {
                                                 self::$directory  = $path.$search.'/';
+                                                self::$controller_path = $controller_path;
                                                 self::$controller = $segment;
                                                 self::$method     = isset(self::$rsegments[$key + 1]) ? self::$rsegments[$key + 1] : 'index';
@@ -163 +168 @@
                                 // Add the segment to the search
                                 $search .= '/'.$segment;
+                                $controller_path .= $segment.'/';
                         }
                 }

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) {
+                if ($full)
+                {
+                        return url::site(self::$controller_path);
+                }
+                return 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) {
+                if ($full)
+                {
+                        return url::site(self::$controller_path.self::$controller);
+                }
+                return 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) {
+                if ($full)
+                {
+                        return url::site(self::$controller_path.self::$controller.'/'.self::$method);
+                }
+                return self::$method;
+        }
 
 } // End URI Class