X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplatal.php;h=2d988bccfebd361aa0d6d355a946ee265140a470;hb=857a2b960d47c1ef4990e6ed55bad2ed40681f66;hp=6d3237440e6ed37af0fd711991e772fb9d7f5de1;hpb=ec60dba7a82f71656896e0ea3acb4b74eafbb15c;p=platal.git

diff --git a/classes/platal.php b/classes/platal.php
index 6d32374..2d988bc 100644
--- a/classes/platal.php
+++ b/classes/platal.php
@@ -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
 {
@@ -39,12 +41,18 @@ abstract class Platal
     public function __construct()
     {
         global $platal, $session, $globals;
-        $platal  =& $this;
-        $globalclass = PL_GLOBALS_CLASS;
-        $globals = new $globalclass();
+        $platal  = $this;
+
+        /* Assign globals first, then call init: init must be used for operations
+         * that requires access to the content of $globals (e.g. XDB requires
+         * $globals to be assigned.
+         */
+        $globals = $this->buildGlobals();
         $globals->init();
-        $sessionclass = PL_SESSION_CLASS;
-        $session = new $sessionclass();
+
+        /* Get the current session: assign first, then activate the session.
+         */
+        $session = $this->buildSession();
         if (!$session->startAvailableAuth()) {
             Platal::page()->trigError("Données d'authentification invalides.");
         }
@@ -84,6 +92,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;
@@ -101,7 +117,7 @@ abstract class Platal
 
         $hook = $this->__hooks[$p];
 
-        if (!is_callable($hook['hook'])) {
+        if (!is_callable($hook['hook']) && $hook['hook'] != PL_WIKI_HOOK) {
             return null;
         }
 
@@ -272,6 +288,9 @@ abstract class Platal
             }
         }
 
+        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
@@ -304,6 +323,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);
@@ -356,36 +378,65 @@ 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);
+    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);
-		}
-	}
+            Platal::page()->kill($userfriendly);
+        }
+    }
 
+    public function &buildLogger($uid, $suid = 0)
+    {
+        if (defined('PL_LOGGER_CLASS')) {
+            $class = PL_LOGGER_CLASS;
+            return new $class($uid, $suid);
+        } else {
+            return PlLogger::dummy($uid, $suid);
+        }
+    }
+
+    protected function &buildPage()
+    {
+        $pageclass = PL_PAGE_CLASS;
+        $page = new $pageclass();
+        return $page;
+    }
 
     static public function &page()
     {
-        global $platal;
         if (is_null(self::$_page)) {
-            $pageclass = PL_PAGE_CLASS;
-            self::$_page = new $pageclass();
+            global $platal;
+            self::$_page = $platal->buildPage();
         }
         return self::$_page;
     }
 
+    protected function &buildSession()
+    {
+        $sessionclass = PL_SESSION_CLASS;
+        $session = new $sessionclass();
+        return $session;
+    }
+
     static public function &session()
     {
         global $session;
         return $session;
     }
 
+    protected function &buildGlobals()
+    {
+        $globalclass = PL_GLOBALS_CLASS;
+        $globals = new $globalclass();
+        return $globals;
+    }
+
     static public function &globals()
     {
         global $globals;