X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fplatal.php;h=2d988bccfebd361aa0d6d355a946ee265140a470;hb=857a2b960d47c1ef4990e6ed55bad2ed40681f66;hp=cec37f24e87e3fbb51aac7f53e962801dfea3f03;hpb=179afa7fa79902e11498314d37fe4dbf452b3617;p=platal.git diff --git a/classes/platal.php b/classes/platal.php index cec37f2..2d988bc 100644 --- a/classes/platal.php +++ b/classes/platal.php @@ -1,6 +1,6 @@ buildGlobals(); + $globals->init(); + + /* Get the current session: assign first, then activate the session. + */ + $session = $this->buildSession(); + if (!$session->startAvailableAuth()) { + Platal::page()->trigError("Données d'authentification invalides."); + } + $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), '/'); @@ -49,10 +70,9 @@ 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; } - global $globals; if ($globals->mode == '') { pl_redirect('index.html'); } @@ -72,6 +92,14 @@ 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; @@ -89,7 +117,7 @@ class Platal $hook = $this->__hooks[$p]; - if (!is_callable($hook['hook'])) { + if (!is_callable($hook['hook']) && $hook['hook'] != PL_WIKI_HOOK) { return null; } @@ -231,14 +259,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 +275,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 { @@ -255,13 +283,18 @@ class Platal } } if ($hook['auth'] != AUTH_PUBLIC && !$this->check_perms($hook['perms'])) { - return PL_FORBIDDEN; + 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) { + 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 +302,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'; @@ -302,21 +323,125 @@ class Platal case PL_NOT_FOUND: $this->__mods['core']->handler_404($page); break; + + case PL_WIKI: + return PL_WIKI; } $page->assign('platal', $this); $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 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; + $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; + } + } + } + + 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, '
' . pl_entities($error) . '
\n'); + fclose($file); + + 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() + { + if (is_null(self::$_page)) { + 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; + return $globals; + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: