remove debug code and fix route detection

diff --git a/lib/system/RequestHandler.class.php b/lib/system/RequestHandler.class.php
index 724a5df74518153da5565f96ea18876fdf1a1187..bedc94fd91f8a1945216d96414c9fbf2d58202bf 100644 (file)
--- a/lib/system/RequestHandler.class.php
+++ b/lib/system/RequestHandler.class.php
@@ -48,7 +48,6 @@ class RequestHandler extends SingletonFactory {
        
        public function handle () {
                $match = $this->router->match(new Request());
-               var_dump($this->router->getRoutes());
                if ($match !== null) {
                        foreach ($match->getParams() as $key => $value) {
                                $_GET[$key] = $value;
@@ -58,7 +57,6 @@ class RequestHandler extends SingletonFactory {
                        $className = $match->getParam("controller");
                        
                        if (!User::isLoggedIn() && $className != 'dns\page\LoginPage' && $className != 'dns\page\ApiPage') {
-                               echo $className;
                                DNS::getTPL()->display('login.tpl');
                                exit;
                        }

diff --git a/lib/system/route/Request.class.php b/lib/system/route/Request.class.php
index 7ab4912b261bf29211be5e3a46aef0f0c0acc68e..ac40533cb770b4e33d457de0bb136644ac7952c3 100644 (file)
--- a/lib/system/route/Request.class.php
+++ b/lib/system/route/Request.class.php
@@ -8,6 +8,13 @@ class Request extends BaseRequest {
        }
        
        public function getPath() {
-               return $_SERVER['QUERY_STRING'];
+               $queryString = $_SERVER['QUERY_STRING'];
+               
+               if (strpos($queryString, '&') !== false) {
+                       $pos = strpos($queryString, '&');
+                       $queryString = substr($queryString, 0, $pos);
+               }
+               echo $queryString;
+               return $queryString;
        }
 }