OSDN Git Service

Fixed case sensitivity. Fixed extracting target from URL when using base_url.
authorDanny van Kooten <dannyvankooten@gmail.com>
Sun, 27 Nov 2011 19:17:31 +0000 (20:17 +0100)
committerDanny van Kooten <dannyvankooten@gmail.com>
Sun, 27 Nov 2011 19:17:31 +0000 (20:17 +0100)
Router.php

index 57b4c63..0e1fbc3 100644 (file)
@@ -107,7 +107,7 @@ final class Router {
 
         // check for matching URL
         $request_url = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
-        $request_url = rtrim($request_url, '/');
+        $request_url = strtolower(rtrim($request_url, '/'));
 
         // setup route regex for route url
         $route_regex = preg_replace("/:(\w+)/", "(\w+)", $this->base_url.$route_url);
@@ -141,7 +141,8 @@ final class Router {
         } else {
             // target not explicitly given
             // extract from url
-            $target = explode('/', $request_url);
+            $target = explode('/', ltrim(str_replace($this->base_url,'',$request_url),'/'));
+            var_dump($target);
 
             $controller = $target[0];
             $action = (isset($target[1])) ? $target[1] : 'index';