Changeset 4597 for trunk/core/router.core.php

Timestamp:

08/22/10 19:35:26 (21 months ago)

Author:

vain

Message:

• fix bugs on subcontroller recognition and enabled subcontroller dispatching
• added method dispatchable() to test the routing, before dispatching
• added method reset() to set default values to the TargetRoute? object

File:

• trunk/core/router.core.php (modified) (14 diffs)

trunk/core/router.core.php

@@ -237 +237 @@
 
         /**
-         * if there are no uri segments, loading routes and matching is pointless
-         * return the default route
+         * If there are no uri segments, loading routes and matching is pointless.
+         * Dispatch to the default route!
          */
         if(empty($this->uri) or $this->uri === '/')
@@ -245 +245 @@
             Clansuite_TargetRoute::setAction('show');
 
-            return Clansuite_TargetRoute::getInstance();
+            if(Clansuite_TargetRoute::dispatchable() === true)
+            {
+                return Clansuite_TargetRoute::getInstance();
+            }
         }
 
@@ -269 +272 @@
     public function mapMatchURI()
     {
-        Clansuite_Debug::firebug($this->uri);
+        #Clansuite_Debug::firebug($this->uri);
 
         /**
@@ -287 +290 @@
                 $uri = implode('/', $this->uri_segments);
 
-                Clansuite_Debug::firebug($route_values);
+                #Clansuite_Debug::firebug($route_values);
 
                 /**
@@ -296 +299 @@
                 if (1 === preg_match('/^:([a-zA-Z_]+)$/', $uri, $match))
                 {
-                    Clansuite_Debug::firebug($match);
+                    #Clansuite_Debug::firebug($match);
                     $name = $match[1]; #setController($match[1]);
                     $found_route = $name;
@@ -304 +307 @@
                 elseif(1 === preg_match( $route_values['regexp'], $uri, $matches))
                 {
-                    Clansuite_Debug::firebug($matches);
+                    #Clansuite_Debug::firebug($matches);
 
                     # parameters found by regular expression have priority
@@ -312 +315 @@
                     }
 
+                    if(isset($matches['subcontroller']))
+                    {
+                        Clansuite_TargetRoute::setSubController($matches['subcontroller']);
+                    }
+
                     if(isset($matches['action']))
                     {
@@ -323 +331 @@
                 }
 
-                # route found
-                break;
+                if(Clansuite_TargetRoute::dispatchable() === true)
+                {
+                    # route found
+                    break;
+                }
+                else
+                {
+                    Clansuite_TargetRoute::reset();
+                }
             }
         }
@@ -639 +654 @@
             $this->addRoute('/:controller/:action/:id');
             $this->addRoute('/:controller/:action/:id/:format');
-            /*
+
             $this->addRoute('/:controller/:subcontroller');
             $this->addRoute('/:controller/:subcontroller/:action');
             $this->addRoute('/:controller/:subcontroller/:action/:id');
             $this->addRoute('/:controller/:subcontroller/:action/:id/:format');
-            */
         }
     }
@@ -725 +739 @@
 
         # subcontroller
-        if('admin' == $subcontroller)
+        if(isset($subcontroller) and 'admin' == $subcontroller)
         {
             $filename_postfix = '.admin.php';
         }
-        else
+        elseif(isset($subcontroller) and $subcontroller != 'admin') # any subcontroller name as postfix
+        {
+            $filename_postifx = '.'.$subcontroller.'.php';
+        }
+        else # apply standard postfix
         {
             $filename_postfix = '.module.php';
@@ -789 +807 @@
             $action = $submodule . '_' . $action;
         }
-
-        #Clansuite_Debug::firebug($action);
 
         # all clansuite actions are prefixed with 'action_'
@@ -844 +860 @@
     public static function getFilename()
     {
-        if(empty(self::$parameters['filename']))
-        {
+        #if(empty(self::$parameters['filename']))
+        #{
             self::setFilename(self::mapControllerToFilename(self::getModulePath(), self::getController(), self::getSubController()));
-        }
+        #}
 
         return self::$parameters['filename'];
@@ -954 +970 @@
             return self::$parameters['method'];
         }
-        else # add method prefix (action_) and subcontroller prefix (admin_)
-        {
-            #if(empty(self::$parameters['method']))
-            #{
-                self::setMethod(self::mapActionToActioname(self::getAction(), self::getSubController()));
-            #}
+        # add method prefix (action_) and subcontroller prefix (admin_)
+        else
+        {
+            self::setMethod(self::mapActionToActioname(self::getAction(), self::getSubController()));
+
         }
 
@@ -1019 +1034 @@
         $string = (string) implode(",", self::$parameters);
         Clansuite_Debug::firebug($string);
+    }
+
+    public static function dispatchable()
+    {
+        $filename  = self::getFilename();
+        $classname = self::getClassname();
+        $method    = self::getMethod();
+
+        /**
+         * The file we want to call has to exists
+         */
+        if(is_file($filename))
+        {
+            include $filename;
+
+            /**
+             * Inside this file, the correct class has to exist
+             */
+            if(class_exists($classname, false))
+            {
+                # WATCH IT! method_exists works on objects, is_callable on classes! ,)
+                if(is_callable($classname, $method))
+                {
+                      Clansuite_Debug::firebug('(OK) Route is dispatchable: '. $filename .' '. $classname .'->'. $method);
+                      return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                return false;
+            }
+        }
+        else
+        {
+            Clansuite_Debug::firebug('(ERROR) Route not dispatchable: '. $filename .' '. $classname .'->'. $method);
+            return false;
+        }
+    }
+
+    public static function reset()
+    {
+        $reset_params = array(
+            # File
+            'filename' => null,
+            'classname' => null,
+            # Call
+            'controller' => null,
+            'subcontroller' => null,
+            'action' => 'show',
+            'method' => null,
+            'params' => null
+        );
+
+        self::$parameters = array_merge(self::$parameters, $reset_params);
     }