Pluf Framework Commit Details

Date:

2009-02-16 15:17:27 (16 years 2 months ago)

Author:

Loic d'Anterroches

Branch:

develop, master

Commit:

687725ab2a690b5a8393d8fce3391955d4228dd9

Parents:

eb9dd9a39a47533338b50319cba92c02ac5bcbcb

Message:

Better redirection to have canonical URLs.

Changes:

File differences

-121
122 122
123 123
124 
124
125 125
126 126
127 127
... ...
163 163
164 164
165 165
166 
166
167
168
169
170
171
172
173
174
167 175
168 176
169 177
+            foreach ($GLOBALS['_PX_views'] as $key => $ctl) {␊
                $match = array();␊
                if (preg_match($ctl['regex'], $req->query, $match)) {␊
                    $req->view = $ctl;␊
                    $req->view = array($ctl, $match);␊
                    $m = new $ctl['model']();␊
                    if (isset($m->{$ctl['method'].'_precond'})) {␊
                        // Here we have preconditions to respects. If␊

        }␊
        if ($firstpass and substr($req->query, -1) != '/') {␊
            $req->query .= '/';␊
            return self::match($req, false);␊
            $res = self::match($req, false);␊
            if ($res->status_code != 404) {␊
                Pluf::loadFunction('Pluf_HTTP_URL_urlForView');␊
                $name = (isset($req->view[0]['name'])) ? ␊
                    $req->view[0]['name'] : ␊
                    $req->view[0]['model'].'::'.$req->view[0]['method'];␊
                $url = Pluf_HTTP_URL_urlForView($name, array_slice($req->view[1], 1));␊
                return new Pluf_HTTP_Response_Redirect($url, 301);␊
            }␊
        }␊
        return new Pluf_HTTP_Response_NotFound($req);␊
    }␊
 ...
             foreach ($GLOBALS['_PX_views'] as $key => $ctl) {␊
                 $match = array();␊
                 if (preg_match($ctl['regex'], $req->query, $match)) {␊
-                    $req->view = $ctl;␊
+                    $req->view = array($ctl, $match);␊
                     $m = new $ctl['model']();␊
                     if (isset($m->{$ctl['method'].'_precond'})) {␊
                         // Here we have preconditions to respects. If␊
         }␊
         if ($firstpass and substr($req->query, -1) != '/') {␊
             $req->query .= '/';␊
-            return self::match($req, false);␊
+            $res = self::match($req, false);␊
+            if ($res->status_code != 404) {␊
+                Pluf::loadFunction('Pluf_HTTP_URL_urlForView');␊
+                $name = (isset($req->view[0]['name'])) ? ␊
+                    $req->view[0]['name'] : ␊
+                    $req->view[0]['model'].'::'.$req->view[0]['method'];␊
+                $url = Pluf_HTTP_URL_urlForView($name, array_slice($req->view[1], 1));␊
+                return new Pluf_HTTP_Response_Redirect($url, 301);␊
+            }␊
         }␊
         return new Pluf_HTTP_Response_NotFound($req);␊
     }␊

-23
24 24
25 25
26 
26
27
28
29
30
31
32
27 33
28 34
29 35
30 36
31 
37
32 38
33 39
+␊
class Pluf_HTTP_Response_Redirect extends Pluf_HTTP_Response␊
{␊
    function __construct($url)␊
    /**␊
     * Redirect response to a given URL.␊
     *␊
     * @param string URL␊
     * @paran int Redirect code (302) or 301 for permanent␊
     */␊
    function __construct($url, $code=302)␊
    {␊
        $content = sprintf(__('<a href="%s">Please, click here to be redirected</a>.'), $url);␊
        parent::__construct($content);␊
        $this->headers['Location'] = $url;␊
        $this->status_code = 302;␊
        $this->status_code = $code;␊
    }␊
}␊
 ␊
 class Pluf_HTTP_Response_Redirect extends Pluf_HTTP_Response␊
 {␊
-    function __construct($url)␊
+    /**␊
+     * Redirect response to a given URL.␊
+     *␊
+     * @param string URL␊
+     * @paran int Redirect code (302) or 301 for permanent␊
+     */␊
+    function __construct($url, $code=302)␊
     {␊
         $content = sprintf(__('<a href="%s">Please, click here to be redirected</a>.'), $url);␊
         parent::__construct($content);␊
         $this->headers['Location'] = $url;␊
-        $this->status_code = 302;␊
+        $this->status_code = $code;␊
     }␊
 }␊

Download the corresponding diff file

Pluf Framework

File differences

Branches

Tags