X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcore.php;h=f9b429de7b229d4304480f9ba56a76debf4119f9;hb=2899129155afb0cd567c9d1798a4a809c164f5f6;hp=c60cfec71fe09868b228e718ca1b268b9df55979;hpb=b631d8034a2ef2f092d6b29dfdb327182ebf1f6e;p=platal.git

diff --git a/modules/core.php b/modules/core.php
index c60cfec..f9b429d 100644
--- a/modules/core.php
+++ b/modules/core.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -30,7 +30,9 @@ class CoreModule extends PLModule
             'send_bug'      => $this->make_hook('bug',           AUTH_COOKIE),
             'purge_cache'   => $this->make_hook('purge_cache',   AUTH_COOKIE, 'admin'),
             'kill_sessions' => $this->make_hook('kill_sessions', AUTH_COOKIE, 'admin'),
-            'sql_errors'    => $this->make_hook('sqlerror',      AUTH_COOKIE, 'admin'),
+            'sql_errors'    => $this->make_hook('siteerror',     AUTH_COOKIE, 'admin'),
+            'assert_errors' => $this->make_hook('siteerror',     AUTH_COOKIE, 'admin'),
+            'site_errors'   => $this->make_hook('siteerror',     AUTH_COOKIE, 'admin'),
 
             'wiki_help'     => $this->make_hook('wiki_help',     AUTH_PUBLIC),
             'wiki_preview'  => $this->make_hook('wiki_preview',  AUTH_COOKIE, 'user', NO_AUTH),
@@ -41,13 +43,13 @@ class CoreModule extends PLModule
         );
     }
 
-    function handler_valid(&$page)
+    function handler_valid($page)
     {
         readfile($page->compile_dir.'/valid.html');
         exit;
     }
 
-    function handler_403(&$page)
+    function handler_403($page)
     {
         global $globals;
         header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
@@ -55,7 +57,7 @@ class CoreModule extends PLModule
         $page->coreTpl('403.tpl');
     }
 
-    function handler_404(&$page)
+    function handler_404($page)
     {
         global $globals, $platal;
         header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
@@ -64,7 +66,7 @@ class CoreModule extends PLModule
         $page->trigError('Cette page n\'existe pas !!!');
     }
 
-    function handler_login(&$page)
+    function handler_login($page)
     {
         $allkeys = func_get_args();
         unset($allkeys[0]);
@@ -72,15 +74,15 @@ class CoreModule extends PLModule
         pl_redirect($url);
     }
 
-    function handler_favicon(&$page)
+    function handler_favicon($page)
     {
-        $data = file_get_contents(dirname(__FILE__).'/../htdocs/images/favicon.ico');
-        header('Content-Type: image/x-icon');
-        echo $data;
+        global $globals;
+        pl_cached_content_headers("image/x-icon");
+        readfile($globals->spoolroot . '/htdocs/images/favicon.ico');
         exit;
     }
 
-    function handler_robotstxt(&$page)
+    function handler_robotstxt($page)
     {
         global $globals;
 
@@ -94,7 +96,7 @@ class CoreModule extends PLModule
         }
 
         if (count($disallowed_uris) > 0) {
-            header('Content-Type: text/plain');
+            pl_cached_content_headers("text/plain");
             echo "User-agent: *\n";
             foreach ($disallowed_uris as $uri) {
                 echo "Disallow: $uri\n";
@@ -104,7 +106,7 @@ class CoreModule extends PLModule
         return PL_NOT_FOUND;
     }
 
-    function handler_purge_cache(&$page)
+    function handler_purge_cache($page)
     {
         S::assert_xsrf_token();
 
@@ -114,12 +116,12 @@ class CoreModule extends PLModule
         http_redirect(empty($_SERVER['HTTP_REFERER']) ? './' : $_SERVER['HTTP_REFERER']);
     }
 
-    function handler_kill_sessions(&$page)
+    function handler_kill_sessions($page)
     {
         kill_sessions();
     }
 
-    function handler_bug(&$page)
+    function handler_bug($page)
     {
         global $globals;
 
@@ -161,32 +163,28 @@ class CoreModule extends PLModule
         }
     }
 
-    function handler_wiki_help(&$page, $action = 'title')
+    function handler_wiki_help($page, $action = 'title')
     {
         $page->coreTpl('wiki.help.tpl', SIMPLE);
         $page->assign('wiki_help', MiniWiki::help($action == 'title'));
     }
 
     /// Shared handler for wiki syntax result preview
-    function handler_wiki_preview(&$page, $action = 'title')
+    function handler_wiki_preview($page, $action = 'title')
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $text = Env::v('text');
         echo MiniWiki::wikiToHtml($text, $action == 'title');
         exit;
     }
 
-    function handler_sqlerror(&$page) {
+    function handler_siteerror($page) {
         global $globals;
-        $page->coreTpl('sql_errors.tpl');
-        $file = @fopen($globals->spoolroot . '/spool/tmp/query_errors', 'r');
-        if ($file !== false) {
-            $page->assign('errors', fpassthru($file));
-            fclose($file);
-        }
+        $page->coreTpl('site_errors.tpl');
+        $page->assign('errors', PlErrorReport::iterate());
         if (Post::has('clear')) {
-            @unlink($globals->spoolroot . '/spool/tmp/query_errors');
-            $page->trigSuccess("Erreurs MySQL effacées.");
+            PlErrorReport::clear();
+            $page->trigSuccess("Erreurs effacées.");
         }
     }
 }