pluf2 Commit Details

Date:

2008-11-30 04:20:30 (16 years 11 months ago)

Author:

Loic d'Anterroches

Branch:

master

Commit:

964dc2d87da9c823572ce892d4b57aea048127b1

Parents:

3fb39807c9713cfd926592223c37d19b76c43f5d

Message:

Improved the handling of the 404 errors to be simple by default.

Changes:

File differences

-116
117 117
118 118
119 
119
120 120
121 121
122 122
+                }␊
            }␊
        }␊
        return new Pluf_HTTP_Response_NotFound(sprintf(__('The page <em>%s</em> was not found on the server.'), htmlspecialchars($req->query)));␊
        return new Pluf_HTTP_Response_NotFound($req);␊
    }␊
␊
    /**␊
                 }␊
             }␊
         }␊
-        return new Pluf_HTTP_Response_NotFound(sprintf(__('The page <em>%s</em> was not found on the server.'), htmlspecialchars($req->query)));␊
+        return new Pluf_HTTP_Response_NotFound($req);␊
     }␊
 ␊
     /**␊

-23
24 24
25 25
26 
26
27 27
28
29
30
31
32
33
34
35
36
37
38
39
28 40
29 41
30 42
+␊
class Pluf_HTTP_Response_NotFound extends Pluf_HTTP_Response␊
{␊
    function __construct($content, $mimetype=null)␊
    function __construct($request)␊
    {␊
        $content = '';␊
        try {␊
            $context = new Pluf_Template_Context(array('query' => $request->query));␊
            $tmpl = new Pluf_Template('404.html');␊
            $content = $tmpl->render($context);␊
            $mimetype = null;␊
        } catch (Exception $e) {␊
            $mimetype = 'text/plain';␊
            $content = sprintf('The requested URL %s was not found on this server.'."\n"␊
                               .'Please check the URL and try again.'."\n\n".'404 - Not Found',␊
                               Pluf_esc($request->query));␊
        }␊
        parent::__construct($content, $mimetype);␊
        $this->status_code = 404;␊
    }␊
 ␊
 class Pluf_HTTP_Response_NotFound extends Pluf_HTTP_Response␊
 {␊
-    function __construct($content, $mimetype=null)␊
+    function __construct($request)␊
     {␊
+        $content = '';␊
+        try {␊
+            $context = new Pluf_Template_Context(array('query' => $request->query));␊
+            $tmpl = new Pluf_Template('404.html');␊
+            $content = $tmpl->render($context);␊
+            $mimetype = null;␊
+        } catch (Exception $e) {␊
+            $mimetype = 'text/plain';␊
+            $content = sprintf('The requested URL %s was not found on this server.'."\n"␊
+                               .'Please check the URL and try again.'."\n\n".'404 - Not Found',␊
+                               Pluf_esc($request->query));␊
+        }␊
         parent::__construct($content, $mimetype);␊
         $this->status_code = 404;␊
     }␊

Download the corresponding diff file

pluf2

File differences

Branches