X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplatal.php;h=a8b5459667c5d06ac0b3ac3c0d5c9de95ac6d784;hb=720e326185b09135267b32e2c85ca3d7beba37f2;hp=cec37f24e87e3fbb51aac7f53e962801dfea3f03;hpb=756ff73fbb0cdd01cce2eda27ba18e1cc99bd735;p=platal.git

diff --git a/classes/platal.php b/classes/platal.php
index cec37f2..a8b5459 100644
--- a/classes/platal.php
+++ b/classes/platal.php
@@ -23,7 +23,7 @@ define('PL_DO_AUTH',   300);
 define('PL_FORBIDDEN', 403);
 define('PL_NOT_FOUND', 404);
 
-class Platal
+abstract class Platal
 {
     private $__mods;
     private $__hooks;
@@ -34,10 +34,23 @@ class Platal
     public $path;
     public $argv;
 
+    static private $_page = null;
+
     public function __construct()
     {
+        global $platal, $session, $globals;
+        $platal  =& $this;
+        $globalclass = PL_GLOBALS_CLASS;
+        $globals = new $globalclass();
+        $globals->init();
+        $sessionclass = PL_SESSION_CLASS;
+        $session = new $sessionclass();
+        if (!$session->startAvailableAuth()) {
+            Platal::page()->trigError('Données d\'authentification invalide.');
+        }
+
         $modules    = func_get_args();
-        if (is_array($modules[0])) {
+        if (isset($modules[0]) && is_array($modules[0])) {
             $modules = $modules[0];
         }
         $this->path = trim(Get::_get('n', null), '/');
@@ -52,7 +65,6 @@ class Platal
             $this->__hooks += $m->handlers();
         }
 
-        global $globals;
         if ($globals->mode == '') {
             pl_redirect('index.html');
         }
@@ -231,14 +243,14 @@ class Platal
         return $s_perms->hasFlagCombination($perms);
     }
 
-    private function call_hook(PlatalPage &$page)
+    private function call_hook(PlPage &$page)
     {
         $hook = $this->find_hook();
         if (empty($hook)) {
             return PL_NOT_FOUND;
         }
-        global $globals;
-        if ($this->https && !$_SERVER['HTTPS'] && $globals->core->secure_domain) {
+        global $globals, $session;
+        if ($this->https && !@$_SERVER['HTTPS'] && $globals->core->secure_domain) {
             http_redirect('https://' . $globals->core->secure_domain . $_SERVER['REQUEST_URI']);
         }
 
@@ -247,7 +259,7 @@ class Platal
 
         if ($hook['auth'] > S::v('auth', AUTH_PUBLIC)) {
             if ($hook['type'] & DO_AUTH) {
-                if (!call_user_func(array($globals->session, 'doAuth'))) {
+                if (!$session->start($hook['auth'])) {
                     $this->force_login($page);
                 }
             } else {
@@ -259,9 +271,9 @@ class Platal
         }
 
         $val = call_user_func_array($hook['hook'], $args);
-        if ($val & PL_DO_AUTH) {
+        if ($val == PL_DO_AUTH) {
             // The handler need a better auth with the current args
-            if (!call_user_func(array($globals->session, 'doAuth'))) {
+            if (!$session->start($session->loggedLevel())) {
                 $this->force_login($page);
             }
             $val = call_user_func_array($hook['hook'], $args);
@@ -269,25 +281,13 @@ class Platal
         return $val;
     }
 
-    public function force_login(PlatalPage &$page)
-    {
-        header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
-        if (S::logged()) {
-            $page->changeTpl('core/password_prompt_logged.tpl');
-            $page->addJsLink('do_challenge_response_logged.js');
-        } else {
-            $page->changeTpl('core/password_prompt.tpl');
-            $page->addJsLink('do_challenge_response.js');
-        }
-        $page->assign('platal', $this);
-        $page->run();
-    }
+    /** Show the authentication form.
+     */
+    abstract public function force_login(PlPage& $page);
 
     public function run()
     {
-        global $page;
-
-        new_skinned_page('platal/index.tpl');
+        $page =& self::page();
 
         if (empty($this->path)) {
             $this->path = 'index';
@@ -308,14 +308,62 @@ class Platal
         $page->run();
     }
 
-    public function on_subscribe($forlife, $uid, $promo, $pass)
+    public function error403()
     {
-        $args = func_get_args();
-        foreach ($this->__mods as $mod) {
-            if (!is_callable($mod, 'on_subscribe'))
-                continue;
-            call_user_func_array(array($mod, 'on_subscribe'), $args);
+        $page =& self::page();
+
+        $this->__mods['core']->handler_403($page);
+        $page->assign('platal', $this);
+        $page->run();
+    }
+
+    public function error404()
+    {
+        $page =& self::page();
+
+        $this->__mods['core']->handler_404($page);
+        $page->assign('platal', $this);
+        $page->run();
+    }
+
+    public static function load($modname, $include = null)
+    {
+        global $platal;
+        $modname = strtolower($modname);
+        if (isset($platal->__mods[$modname])) {
+            if (is_null($include)) {
+                return;
+            }
+            $platal->__mods[$modname]->load($include);
+        } else {
+            if (is_null($include)) {
+                require_once PLModule::path($modname) . '.php';
+            } else {
+                require_once PLModule::path($modname) . '/' . $include;
+            }
+        }
+    }
+
+    static public function &page()
+    {
+        global $platal;
+        if (is_null(self::$_page)) {
+            $pageclass = PL_PAGE_CLASS;
+            self::$_page = new $pageclass();
         }
+        return self::$_page;
+    }
+
+    static public function &session()
+    {
+        global $session;
+        return $session;
+    }
+
+    static public function &globals()
+    {
+        global $globals;
+        return $globals;
     }
 }