Changeset 2889

Timestamp:

06/24/08 10:18:12 (3 months ago)

Author:

Shadowhand

Message:

Fixing controllers in sub-dirs, hopefully

Files:

• trunk/system/libraries/Router.php (modified) (3 diffs)

trunk/system/libraries/Router.php

@@ -92 +92 @@
                         $controller_path .= $segment;
 
-                        if ($path = Kohana::find_file('controllers', $controller_path, FALSE))
-                        {
-                                // Set controller name
-                                self::$controller = $segment;
-
-                                // Change controller path
-                                self::$controller_path = $path;
-                        }
-                        else
-                        {
-                                // Stop searching
+                        $found = FALSE;
+                        foreach (Config::include_paths() as $dir)
+                        {
+                                // Search within controllers only
+                                $dir .= 'controllers/';
+
+                                if (file_exists($dir.$controller_path) OR file_exists($dir.$controller_path.EXT))
+                                {
+                                        // Valid path
+                                        $found = TRUE;
+
+                                        if (is_file($dir.$controller_path.EXT))
+                                        {
+                                                // Set controller name
+                                                self::$controller = $segment;
+
+                                                // Change controller path
+                                                self::$controller_path = $dir.$controller_path.EXT;
+                                        }
+
+                                        // Skip remaining controller paths
+                                        continue;
+                                }
+                        }
+
+                        if ($found === FALSE)
+                        {
+                                // Stop searching, nothing was found
                                 break;
                         }
@@ -110 +127 @@
                 }
 
-                
                 if (self::$controller !== NULL AND isset(self::$rsegments[$key]))
                 {
                         // Set method
-                        self::$method = isset(self::$rsegments[1]) ? self::$rsegments[1] : 'index'; 
+                        self::$method = self::$rsegments[$key];
 
                         if (isset(self::$rsegments[$key + 1]))
@@ -122 +138 @@
                         }
                 }
-                
+
                 // Last chance to set routing before a 404 is triggered
                 Event::run('system.post_routing');