X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcore.php;h=f044d9b112d940ee4919146ed0a669b017dc6d64;hb=6dae45b393a59fd04713b9c651ff0970aeec84d7;hp=2165d27fc051a2f2580efcf7b3f1f9475ca79e03;hpb=bf517dafc122edf6ccd86847f0626cfd0df9f340;p=platal.git diff --git a/modules/core.php b/modules/core.php index 2165d27..f044d9b 100644 --- a/modules/core.php +++ b/modules/core.php @@ -1,6 +1,6 @@ $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'), + 'wiki_help' => $this->make_hook('wiki_help', AUTH_PUBLIC), + 'wiki_preview' => $this->make_hook('wiki_preview', AUTH_COOKIE, 'user', NO_AUTH), + '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), ); } @@ -46,22 +51,14 @@ class CoreModule extends PLModule { global $globals; header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden'); - if (!empty($GLOBALS['IS_XNET_SITE']) && $globals->asso()) { - new_skinned_page('core/403.tpl'); - } else { - $page->changeTpl('core/403.tpl'); - } + $page->changeTpl('core/403.tpl'); } function handler_404(&$page) { global $globals, $platal; header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found'); - if (!empty($GLOBALS['IS_XNET_SITE']) && $globals->asso()) { - new_group_open_page('core/404.tpl'); - } else { - $page->changeTpl('core/404.tpl'); - } + $page->changeTpl('core/404.tpl'); $page->assign('near', $platal->near_hook()); } @@ -81,9 +78,23 @@ class CoreModule extends PLModule exit; } + function handler_robotstxt(&$page) + { + global $globals; + if (!$globals->core->restricted_platal) { + return PL_NOT_FOUND; + } + + header('Content-Type: text/plain'); + echo "User-agent: *\n"; + echo "Disallow: /\n"; + exit; + } + function handler_purge_cache(&$page) { require_once 'wiki.inc.php'; + S::assert_xsrf_token(); $page->clear_compiled_tpl(); wiki_clear_all_cache(); @@ -91,6 +102,11 @@ class CoreModule extends PLModule http_redirect(empty($_SERVER['HTTP_REFERER']) ? './' : $_SERVER['HTTP_REFERER']); } + function handler_kill_sessions(&$page) + { + kill_sessions(); + } + function handler_get_rights(&$page, $level) { if (S::has('suid')) { @@ -99,7 +115,7 @@ class CoreModule extends PLModule if (isset($_SESSION['log'])) { $_SESSION['log']->log("suid_start", "login by ".S::v('forlife')); - } + } $_SESSION['suid'] = $_SESSION; $_SESSION['perms'] =& XorgSession::make_perms($level); @@ -108,9 +124,12 @@ class CoreModule extends PLModule function handler_bug(&$page) { - $page->changeTpl('core/bug.tpl',SIMPLE); + global $globals; + $page->changeTpl('core/bug.tpl', SIMPLE); $page->addJsLink('close_on_esc.js'); if (Env::has('send') && trim(Env::v('detailed_desc'))) { + S::assert_xsrf_token(); + $body = wordwrap(Env::v('detailed_desc'), 78) . "\n\n" . "----------------------------\n" . "Page : " . Env::v('page') . "\n\n" @@ -119,8 +138,9 @@ class CoreModule extends PLModule . "Skin : " . S::v('skin') . "\n"; $page->assign('bug_sent',1); $mymail = new PlMailer(); - $mymail->setFrom('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@polytechnique.org>'); - $mymail->addTo('support+platal@polytechnique.org'); + $mymail->setFrom('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@' . $globals->mail->domain . '>'); + $mymail->addTo('support+platal@' . $globals->mail->domain); + $mymail->addCc('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@' . $globals->mail->domain . '>'); $mymail->setSubject('Plat/al '.Env::v('task_type').' : '.Env::v('item_summary')); $mymail->setTxtBody($body); $mymail->send(); @@ -128,6 +148,21 @@ class CoreModule extends PLModule $page->trig("Merci de remplir une explication du problème rencontré"); } } + + function handler_wiki_help(&$page, $action = 'title') + { + $page->changeTpl('core/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') + { + header('Content-Type: text/html; charset=utf-8'); + $text = Get::v('text'); + echo MiniWiki::wikiToHtml($text, $action == 'title'); + exit; + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: