X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplatal.php;h=f0569d6d84d93edd65ed2e9bf36fd70071ccd475;hb=bfb9093b94f6403150200e3081c895cf5e48f563;hp=27cdd096f5a9912877d9e4c605dfec9b244cd67f;hpb=f1c8bb75eaae934ac2dd1cbd7f8bbc10960413ee;p=platal.git

diff --git a/classes/platal.php b/classes/platal.php
index 27cdd09..f0569d6 100644
--- a/classes/platal.php
+++ b/classes/platal.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -22,6 +22,8 @@
 define('PL_DO_AUTH',   300);
 define('PL_FORBIDDEN', 403);
 define('PL_NOT_FOUND', 404);
+define('PL_WIKI',      500);
+define('PL_WIKI_HOOK', '@@WIKI@@');
 
 abstract class Platal
 {
@@ -46,7 +48,7 @@ abstract class Platal
         $sessionclass = PL_SESSION_CLASS;
         $session = new $sessionclass();
         if (!$session->startAvailableAuth()) {
-            Platal::page()->trigError('Données d\'authentification invalide.');
+            Platal::page()->trigError("Données d'authentification invalides.");
         }
 
         $modules    = func_get_args();
@@ -62,7 +64,7 @@ abstract class Platal
         foreach ($modules as $module) {
             $module = strtolower($module);
             $this->__mods[$module] = $m = PLModule::factory($module);
-            $this->__hooks += $m->handlers();
+            $this->__hooks = $m->handlers() + $this->__hooks;
         }
 
         if ($globals->mode == '') {
@@ -84,6 +86,14 @@ abstract class Platal
         return join('/', array_slice($this->argv, 0, $n));
     }
 
+    public static function wiki_hook($auth = AUTH_PUBLIC, $perms = 'user', $type = DO_AUTH)
+    {
+        return array('hook'  => PL_WIKI_HOOK,
+                     'auth'  => $auth,
+                     'perms' => $perms,
+                     'type'  => $type);
+    }
+
     protected function find_hook()
     {
         $p = $this->path;
@@ -267,13 +277,14 @@ abstract class Platal
             }
         }
         if ($hook['auth'] != AUTH_PUBLIC && !$this->check_perms($hook['perms'])) {
-            if (S::admin()) {
-                $page->trigWarning('Tu accèdes à cette page car tu es administrateur du site.');
-            } else {
+            if (self::notAllowed()) {
                 return PL_FORBIDDEN;
             }
         }
 
+        if ($hook['hook'] == PL_WIKI_HOOK) {
+            return PL_WIKI;
+        }
         $val = call_user_func_array($hook['hook'], $args);
         if ($val == PL_DO_AUTH) {
             // The handler need a better auth with the current args
@@ -306,6 +317,9 @@ abstract class Platal
           case PL_NOT_FOUND:
             $this->__mods['core']->handler_404($page);
             break;
+
+          case PL_WIKI:
+            return PL_WIKI;
         }
 
         $page->assign('platal', $this);
@@ -330,6 +344,16 @@ abstract class Platal
         $page->run();
     }
 
+    public static function notAllowed()
+    {
+        if (S::admin()) {
+            self::page()->trigWarning('Tu accèdes à cette page car tu es administrateur du site.');
+            return false;
+        } else {
+            return true;
+        }
+    }
+
     public static function load($modname, $include = null)
     {
         global $platal;
@@ -348,6 +372,20 @@ abstract class Platal
         }
     }
 
+	public static function assert($cond, $error, $userfriendly)
+	{
+		global $globals;
+		if ($cond === false) {
+			header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error');
+			$file = fopen($globals->spoolroot . '/spool/tmp/assert_erros', 'a');
+			fwrite($file, '<pre>' . pl_entities($error) . '</pre>\n');
+			fclose($file);
+
+			Platal::page()->kill($userfriendly);
+		}
+	}
+
+
     static public function &page()
     {
         global $platal;