X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcore.php;h=97eb6a66ea0d6aef2b15d0258ffac3af61eae0ce;hb=ac6f41acd95a154ff0893f5e239760e026eb9d2a;hp=db4c7a143d029442369a2142eb76419803bc8942;hpb=029135c8d7891915fb00fdc5352ba57dc5fa2837;p=platal.git diff --git a/modules/core.php b/modules/core.php index db4c7a1..97eb6a6 100644 --- a/modules/core.php +++ b/modules/core.php @@ -1,6 +1,6 @@ $this->make_hook('403', AUTH_PUBLIC), - '404' => $this->make_hook('404', AUTH_PUBLIC), - 'login' => $this->make_hook('login', AUTH_COOKIE), - 'send_bug' => $this->make_hook('bug', AUTH_COOKIE), - 'purge_cache' => $this->make_hook('purge_cache', AUTH_COOKIE, 'admin'), + '400' => $this->make_hook('400', AUTH_PUBLIC), + '403' => $this->make_hook('403', AUTH_PUBLIC), + '404' => $this->make_hook('404', AUTH_PUBLIC), + 'login' => $this->make_hook('login', AUTH_COOKIE), + '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'), - 'get_rights' => $this->make_hook('get_rights', AUTH_MDP, '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'), + 'site_errors/rss' => $this->make_token_hook('siteerror_rss', AUTH_COOKIE, 'admin'), - 'wiki_help' => $this->make_hook('wiki_help', AUTH_PUBLIC), - 'wiki_preview' => $this->make_hook('wiki_preview', AUTH_COOKIE, 'user', NO_AUTH), + 'embedded' => $this->make_hook('embedded', AUTH_PUBLIC), - 'valid.html' => $this->make_hook('valid', AUTH_PUBLIC), - 'favicon.ico' => $this->make_hook('favicon', AUTH_PUBLIC), - 'robots.txt' => $this->make_hook('robotstxt', AUTH_PUBLIC, 'user', NO_HTTPS), + 'wiki_help' => $this->make_hook('wiki_help', AUTH_PUBLIC), + 'wiki_preview' => $this->make_hook('wiki_preview', AUTH_COOKIE, 'user', NO_AUTH), + + 'validator' => $this->make_hook('validator', AUTH_PUBLIC), + 'valid.html' => $this->make_hook('valid', AUTH_PUBLIC), + 'favicon.ico' => $this->make_hook('favicon', AUTH_PUBLIC), + 'robots.txt' => $this->make_hook('robotstxt', AUTH_PUBLIC, 'user', NO_HTTPS), ); } - function handler_valid(&$page) + function handler_valid($page) { readfile($page->compile_dir.'/valid.html'); exit; } - function handler_403(&$page) + function handler_validator($page) { global $globals; + exec($globals->spoolroot."/bin/devel/xhtml.validate.pl ".$page->compile_dir."/valid.html", $val); + $url = ""; + $replc = 'HTML OK'; + foreach ($val as $h) { + if (preg_match("/^X-W3C-Validator-Errors: (\d+)$/", $h, $m)) { + if ($m[1]) { + $replc = "$url{$m[1]} ERREUR(S) !!!"; + } + break; + } + } + echo $replc; + exit; + } + + function handler_400(PlPage $page) + { + header($_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request'); + $page->coreTpl('40x.tpl'); + $page->trigError('Ta requête est invalide.'); + } + + function handler_403(PlPage $page) + { header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden'); + $page->coreTpl('40x.tpl'); $page->trigError('Tu n\'as pas les permissions nécessaires pour accéder à cette page.'); - $page->coreTpl('403.tpl'); } - function handler_404(&$page) + function handler_404(PlPage $page) { - global $globals, $platal; + global $platal; header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found'); $page->coreTpl('404.tpl'); $page->assign('near', $platal->near_hook()); $page->trigError('Cette page n\'existe pas !!!'); } - function handler_login(&$page) + function handler_login($page) { $allkeys = func_get_args(); unset($allkeys[0]); @@ -72,63 +103,55 @@ 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; - if (!$globals->core->restricted_platal) { - return PL_NOT_FOUND; + + $disallowed_uris = array(); + if ($globals->core->restricted_platal) { + $disallowed_uris[] = '/'; + } else if (!empty($globals->core->robotstxt_disallowed_uris)) { + $disallowed_uris = preg_split('/[\s,]+/', + $globals->core->robotstxt_disallowed_uris, + -1, PREG_SPLIT_NO_EMPTY); } - header('Content-Type: text/plain'); - echo "User-agent: *\n"; - echo "Disallow: /\n"; - exit; + if (count($disallowed_uris) > 0) { + pl_cached_content_headers("text/plain"); + echo "User-agent: *\n"; + foreach ($disallowed_uris as $uri) { + echo "Disallow: $uri\n"; + } + exit; + } + return PL_NOT_FOUND; } - function handler_purge_cache(&$page) + function handler_purge_cache($page) { S::assert_xsrf_token(); $page->clear_compiled_tpl(); PlWikiPage::clearCache(); + PlCache::clearAll(); http_redirect(empty($_SERVER['HTTP_REFERER']) ? './' : $_SERVER['HTTP_REFERER']); } - function handler_kill_sessions(&$page) + function handler_kill_sessions($page) { kill_sessions(); } - function handler_get_rights(&$page, $level) - { - if (S::has('suid')) { - $page->kill('Déjà en SUID'); - } - - if (isset($_SESSION['log'])) { - if (S::user()) { - S::logger()->log("suid_start", "login by " . S::user()->login()); - } else { - // TODO(vzanotti): trash that code when support of forlife will be gone. - S::logger()->log("suid_start", "login by ".S::v('forlife')); - } - } - Platal::session()->startSUID(S::i('uid')); - Platal::session()->makePerms($level); - - pl_redirect('/'); - } - - function handler_bug(&$page) + function handler_bug($page) { global $globals; @@ -148,11 +171,10 @@ class CoreModule extends PLModule if (Env::has('send') && trim(Env::v('detailed_desc'))) { S::assert_xsrf_token(); - // TODO(vzanotti): trash the 'forlife' bit when support of forlife will be gone. $body = wordwrap(Env::v('detailed_desc'), 78) . "\n\n" . "----------------------------\n" . "Page : " . Env::v('page') . "\n\n" - . "Utilisateur : " . (S::user() ? S::user()->login() : S::v('forlife')) . "\n" + . "Utilisateur : " . S::user()->login() . "\n" . "Navigateur : " . $_SERVER['HTTP_USER_AGENT'] . "\n" . "Skin : " . S::v('skin') . "\n"; $page->assign('bug_sent', 1); @@ -160,14 +182,8 @@ class CoreModule extends PLModule . ', tu devrais en recevoir une copie d\'ici quelques minutes. Nous allons ' . 'le traiter et y répondre dans les plus brefs délais.'); $mymail = new PlMailer(); - // TODO(vzanotti): trash the 'bestalias' bits when support of bestalias will be gone. - if (S::user()) { - $mymail->setFrom(sprintf('"%s" <%s>', S::user()->fullName(), S::user()->bestEmail())); - $mymail->addCc(sprintf('"%s" <%s>', S::user()->fullName(), S::user()->bestEmail())); - } else { - $mymail->setFrom('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@' . $globals->mail->domain . '>'); - $mymail->addCc('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@' . $globals->mail->domain . '>'); - } + $mymail->setFrom(sprintf('"%s" <%s>', S::user()->fullName(), S::user()->bestEmail())); + $mymail->addCc(sprintf('"%s" <%s>', S::user()->fullName(), S::user()->bestEmail())); $mymail->addTo('support+platal@' . $globals->mail->domain); $mymail->setSubject('Plat/al '.Env::v('task_type').' : '.Env::v('item_summary')); $mymail->setTxtBody($body); @@ -177,20 +193,51 @@ 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'); - $text = Get::v('text'); + pl_content_headers("text/html"); + $text = Env::v('text'); echo MiniWiki::wikiToHtml($text, $action == 'title'); exit; } + + function handler_siteerror($page) + { + global $globals; + $page->coreTpl('site_errors.tpl'); + $page->setRssLink('Polytechnique.org :: Erreurs', + 'site_errors/rss/' . S::v('hruid') . '/' . S::user()->token . '/rss.xml'); + if (Post::has('clear')) { + PlErrorReport::clear(); + $page->trigSuccess("Erreurs effacées."); + } + $page->assign('errors', PlErrorReport::iterate()); + } + + function handler_siteerror_rss(PlPage $page, PlUser $user) + { + return PlErrorReport::feed($page, $user); + } + + function handler_embedded($page) + { + global $platal, $globals; + $allkeys = func_get_args(); + $mode = $allkeys[1]; + unset($allkeys[0]); + unset($allkeys[1]); + Env::set('display', $mode); + $globals->baseurl .= '/embedded/' . $mode; + $platal->path = join('/', $allkeys); + $platal->run(); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: