Merge pull request #72 from skipperbent/development

[BUGFIX] Only render group if prefix matches.

src/Pecee/Http/Request.php

@@ -44,6 +44,9 @@ class Request {
     }
 
     public function getIsSecure() {
+        if(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) === 'https') {
+            return true;
+        }
         return isset($_SERVER['HTTPS']) ? true : (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] === 443);
     }
 

src/Pecee/Http/Response.php

@@ -19,8 +19,13 @@ class Response {
      * Redirect the response
      *
      * @param string $url
+     * @param int $httpCode
      */
-    public function redirect($url) {
+    public function redirect($url, $httpCode = null) {
+        if($httpCode !== null) {
+            $this->httpCode($httpCode);
+        }
+
         $this->header('Location: ' . $url);
         die();
     }

src/Pecee/SimpleRouter/RouterBase.php

@@ -86,7 +86,7 @@ class RouterBase {
 
             $this->currentRoute = $route;
 
-            if($route instanceof RouterGroup && is_callable($route->getCallback())) {
+            if($route instanceof RouterGroup && $route->matchRoute($this->request) && is_callable($route->getCallback())) {
                 $group = $route;
                 $route->renderRoute($this->request);
                 $mergedSettings = array_merge($route->getMergeableSettings(), $settings);
@@ -126,12 +126,6 @@ class RouterBase {
 
             $route = $this->controllerUrlMap[$i];
 
-            if($route->getGroup() !== null) {
-                if($route->getGroup()->matchDomain($this->request) === false) {
-                    continue;
-                }
-            }
-
             $routeMatch = $route->matchRoute($this->request);
 
             if($routeMatch) {

src/Pecee/SimpleRouter/RouterController.php

@@ -43,7 +43,7 @@ class RouterController extends RouterEntry {
     }
 
     public function matchRoute(Request $request) {
-        $url = parse_url($request->getUri());
+        $url = parse_url(urldecode($request->getUri()));
         $url = rtrim($url['path'], '/') . '/';
 
         if(strtolower($url) == strtolower($this->url) || stripos($url, $this->url) === 0) {

src/Pecee/SimpleRouter/RouterEntry.php

@@ -248,7 +248,7 @@ abstract class RouterEntry {
         return new $name();
     }
 
-    protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]+?') {
+    protected function parseParameters($route, $url, $parameterRegex = '[a-z0-9]+') {
         $parameterNames = array();
         $regex = '';
         $lastCharacter = '';
@@ -376,7 +376,11 @@ abstract class RouterEntry {
                 throw new RouterException(sprintf('Method %s does not exist in class %s', $method, $className), 404);
             }
 
-            call_user_func_array(array($class, $method), $this->getParameters());
+            $parameters = array_filter($this->getParameters(), function($var){
+                return !is_null($var);
+            });
+
+            call_user_func_array(array($class, $method), $parameters);
 
             return $class;
         }

src/Pecee/SimpleRouter/RouterGroup.php

@@ -66,7 +66,12 @@ class RouterGroup extends RouterEntry {
     }
 
     public function matchRoute(Request $request) {
-        return null;
+        // Skip if prefix doesn't match
+        if($this->getPrefix() !== null && stripos($request->getUri(), $this->getPrefix()) === false) {
+            return false;
+        }
+
+        return $this->matchDomain($request);
     }
 
     public function setExceptionHandler($class) {

src/Pecee/SimpleRouter/RouterResource.php

@@ -46,7 +46,7 @@ class RouterResource extends RouterEntry {
     }
 
     public function matchRoute(Request $request) {
-        $url = parse_url($request->getUri());
+        $url = parse_url(urldecode($request->getUri()));
         $url = rtrim($url['path'], '/') . '/';
 
         $route = rtrim($this->url, '/') . '/{id?}/{action?}';
@@ -59,7 +59,7 @@ class RouterResource extends RouterEntry {
                 $parameters = array_merge($this->parameters, $parameters);
             }
 
-            $action = $parameters['action'];
+            $action = isset($parameters['action']) ? $parameters['action'] : null;
             unset($parameters['action']);
 
             // Delete

src/Pecee/SimpleRouter/RouterRoute.php

@@ -21,7 +21,7 @@ class RouterRoute extends RouterEntry {
 
     public function matchRoute(Request $request) {
 
-        $url = parse_url($request->getUri());
+        $url = parse_url(urldecode($request->getUri()));
         $url = rtrim($url['path'], '/') . '/';
 
         // Match on custom defined regular expression
@@ -40,10 +40,18 @@ class RouterRoute extends RouterEntry {
         $parameters = $this->parseParameters($route, $url);
 
         if($parameters !== null) {
-            $this->parameters = $parameters;
+
+            if(is_array($this->parameters)) {
+                $this->parameters = array_merge($this->parameters, $parameters);
+            } else {
+                $this->parameters = $parameters;
+            }
+
             return true;
         }
 
+
+
         return null;
     }