Merge pull request #73 from skipperbent/development

Development
[TASK] Readded group match inheritence .
2026-06-19 09:41:25 +00:00 · 2016-03-18 17:55:31 +01:00 · 2016-03-18 17:43:57 +01:00 · 2016-03-18 15:21:45 +01:00 · 2016-03-16 19:58:03 +01:00 · 2016-03-16 19:57:54 +01:00
8 changed files with 32 additions and 13 deletions
@@ -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);
    }

@@ -151,4 +154,16 @@ class Request {
        return $this->loadedRoute;
    }

+    public function isFormatAccepted($format) {
+        return (isset($_SERVER['HTTP_ACCEPT']) && stripos($_SERVER['HTTP_ACCEPT'], $format) > -1);
+    }
+
+    public function getAcceptFormats() {
+        if(isset($_SERVER['HTTP_ACCEPT'])) {
+            return explode(',', $_SERVER['HTTP_ACCEPT']);
+        }
+
+        return array();
+    }
+
 }
@@ -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();
    }
@@ -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) {
@@ -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) {
@@ -201,7 +201,7 @@ abstract class RouterEntry {
     */
    public function addSettings(array $settings = null) {
        if(is_array($settings)) {
-            $this->settings = array_merge($this->settings, $settings);
+            $this->settings = array_merge($settings, $this->settings);
        }
        return $this;
    }
@@ -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) {
@@ -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?}';
@@ -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
Author	SHA1	Message	Date
Simon Sessingø	358b25d4f1	Merge pull request #73 from skipperbent/development Development	2016-03-18 17:55:31 +01:00
Simon Sessingø	5483ffe458	[TASK] Readded group match inheritence . - Settings on routes now have higher priority when merging settings from group.	2016-03-18 17:43:57 +01:00
Simon Sessingø	6d8e95fcaa	[TASK] Match on group are no longer merged to child routes.	2016-03-18 15:21:45 +01:00
Simon Sessingø	3d45851d9b	Merge pull request #72 from skipperbent/development [BUGFIX] Only render group if prefix matches.	2016-03-16 19:58:03 +01:00
Simon Sessingø	db78135d19	[BUGFIX] Only render group if prefix matches.	2016-03-16 19:57:54 +01:00
Simon Sessingø	c4fcf750d4	Added support for x-forwarded-proto http header	2016-03-14 01:09:35 +01:00
Simon Sessingø	ee5c2207f8	Merge pull request #71 from skipperbent/development Added support for x-forwarded-proto http header	2016-03-14 01:08:25 +01:00
Simon Sessingø	a92b6008fa	[TASK] Added http code to redirect method.	2016-03-14 01:00:19 +01:00
Simon Sessingø	b1ca3fc9ef	Merge pull request #70 from skipperbent/development [FEATURE] Added http code to redirect method.	2016-03-14 00:59:09 +01:00
Simon Sessingø	253c0c70d4	Merge pull request #69 from skipperbent/development [BUGFIX] Bugfix	2016-03-01 22:52:38 +01:00
Simon Sessingø	115c8e510a	[BUGFIX] Added urldecode to RouterRessource, RouterRoute and RouterController class to ensure that urls with special letters can be picked up by a custom regular expression (read documentation: match).	2016-03-01 22:50:26 +01:00