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

Timestamp:

08/27/10 23:01:58 (21 months ago)

Author:

vain

Message:

• minor change to all security constant checks
• fixed the non rewrite routing

File:

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

trunk/core/router.core.php

@@ -226 +226 @@
     {
         # detects if RewriteEngine is active and calls the proper URLParser for extraction of uri segments
-        if(true === $this->isRewriteEngineOn())
+        if(true === $this->isRewriteEngineOn() and !isset($_GET['mod']) and !isset($_GET['sub']))
         {
             $this->UrlParser_Rewrite($this->uri);
@@ -426 +426 @@
     public function NoRewriteRoute()
     {
-        $route = new Clansuite_TargetRoute();
-
         # Controller
         if(isset($this->uri_segments['mod']))
         {
-            $route->setController($this->uri_segments['mod']);
+            Clansuite_TargetRoute::setController($this->uri_segments['mod']);
             unset($this->uri_segments['mod']);
         }
@@ -438 +436 @@
         if(isset($this->uri_segments['sub']))
         {
-            $route->setSubController($this->uri_segments['sub']);
+            Clansuite_TargetRoute::setSubController($this->uri_segments['sub']);
             unset($this->uri_segments['sub']);
         }
@@ -445 +443 @@
         if(isset($this->uri_segments['action']))
         {
-            $route->setAction($this->uri_segments['action']);
+            Clansuite_TargetRoute::setAction($this->uri_segments['action']);
             unset($this->uri_segments['action']);
         }
@@ -452 +450 @@
         if(count($this->uri_segments) > 0)
         {
-            $route->setParameters($this->uri_segments);
+            Clansuite_TargetRoute::setParameters($this->uri_segments);
             unset($this->uri_segments);
         }
 
-        return $route;
+        if(Clansuite_TargetRoute::dispatchable() === true)
+        {
+            return Clansuite_TargetRoute::getInstance();
+        }
     }