Merge remote branch 'origin/core/1.1.2/maint' into core/master

[platal.git] / modules / core.php

diff --git a/modules/core.php b/modules/core.php
index 4c00f88..8be36c0 100644 (file)
--- a/modules/core.php
+++ b/modules/core.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -24,6 +24,7 @@ class CoreModule extends PLModule
     function handlers()
     {
         return array(
+            '400'           => $this->make_hook('400',           AUTH_PUBLIC),
             '403'           => $this->make_hook('403',           AUTH_PUBLIC),
             '404'           => $this->make_hook('404',           AUTH_PUBLIC),
             'login'         => $this->make_hook('login',         AUTH_COOKIE),
@@ -39,6 +40,7 @@ class CoreModule extends PLModule
             'wiki_help'     => $this->make_hook('wiki_help',     AUTH_PUBLIC),
             'wiki_preview'  => $this->make_hook('wiki_preview',  AUTH_COOKIE, 'user', NO_AUTH),
 
+            'validator'     => $this->make_hook('validator',     AUTH_PUBLIC),
             'valid.html'    => $this->make_hook('valid',         AUTH_PUBLIC),
             'favicon.ico'   => $this->make_hook('favicon',       AUTH_PUBLIC),
             'robots.txt'    => $this->make_hook('robotstxt',     AUTH_PUBLIC, 'user', NO_HTTPS),
@@ -51,17 +53,41 @@ class CoreModule extends PLModule
         exit;
     }
 
-    function handler_403($page)
+    function handler_validator($page)
     {
         global $globals;
+        exec($globals->spoolroot."/bin/devel/xhtml.validate.pl ".$page->compile_dir."/valid.html", $val);
+        $url   = "<a href='http://validator.w3.org/check?uri={$globals->baseurl}/valid.html&amp;ss=1#result'>";
+        $replc = '<span style="color: #080;">HTML OK</span>';
+        foreach ($val as $h) {
+            if (preg_match("/^X-W3C-Validator-Errors: (\d+)$/", $h, $m)) {
+                if ($m[1]) {
+                    $replc = "<span class='erreur'>$url{$m[1]} ERREUR(S) !!!</a></span>";
+                }
+                break;
+            }
+        }
+        echo $replc;
+        exit;
+    }
+
+    function handler_400(PlPage $page)
+    {
+        header($_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request');
+        $page->coreTpl('40x.tpl');
+        $page->trigError('Ta requête est invalide.');
+    }
+
+    function handler_403(PlPage $page)
+    {
         header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
+        $page->coreTpl('40x.tpl');
         $page->trigError('Tu n\'as pas les permissions nécessaires pour accéder à cette page.');
-        $page->coreTpl('403.tpl');
     }
 
-    function handler_404($page)
+    function handler_404(PlPage $page)
     {
-        global $globals, $platal;
+        global $platal;
         header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
         $page->coreTpl('404.tpl');
         $page->assign('near', $platal->near_hook());
@@ -114,6 +140,7 @@ class CoreModule extends PLModule
 
         $page->clear_compiled_tpl();
         PlWikiPage::clearCache();
+        PlCache::clearAll();
 
         http_redirect(empty($_SERVER['HTTP_REFERER']) ? './' : $_SERVER['HTTP_REFERER']);
     }
@@ -183,11 +210,11 @@ class CoreModule extends PLModule
     function handler_siteerror($page) {
         global $globals;
         $page->coreTpl('site_errors.tpl');
-        $page->assign('errors', PlErrorReport::iterate());
         if (Post::has('clear')) {
             PlErrorReport::clear();
             $page->trigSuccess("Erreurs effacées.");
         }
+        $page->assign('errors', PlErrorReport::iterate());
     }
 
     function handler_embedded($page)