X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcore.php;h=6557ca491f1aecada3dd9a855acafe77844feb62;hb=88541046480799a8d92eba186f22e22c0c64efb0;hp=663af58d5c243d08510e2b6c205e7920b1e6e5be;hpb=e8dfa21cb3ade890694157170de1a1c6d7519531;p=platal.git diff --git a/modules/core.php b/modules/core.php index 663af58..6557ca4 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'), + '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'), - '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), + '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), ); } - function handler_valid(&$page) + function handler_valid($page) { readfile($page->compile_dir.'/valid.html'); exit; } - function handler_403(&$page) + function handler_403($page) { global $globals; header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden'); - $page->changeTpl('core/403.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($page) { global $globals, $platal; header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found'); - $page->changeTpl('core/404.tpl'); + $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]); @@ -69,89 +76,133 @@ 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_purge_cache(&$page) + function handler_robotstxt($page) { - if (S::has_xsrf_token()) { - require_once 'wiki.inc.php'; + global $globals; - $page->clear_compiled_tpl(); - wiki_clear_all_cache(); + $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); + } - http_redirect(empty($_SERVER['HTTP_REFERER']) ? './' : $_SERVER['HTTP_REFERER']); - } else { - $page->kill("La purge du cache a échouée, merci de réessayer."); + 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_kill_sessions(&$page) + function handler_purge_cache($page) { - kill_sessions(); - } + S::assert_xsrf_token(); - function handler_get_rights(&$page, $level) - { - if (S::has('suid')) { - $page->kill('Déjà en SUID'); - } + $page->clear_compiled_tpl(); + PlWikiPage::clearCache(); + PlCache::clearAll(); - if (isset($_SESSION['log'])) { - $_SESSION['log']->log("suid_start", "login by ".S::v('forlife')); - } - $_SESSION['suid'] = $_SESSION; - $_SESSION['perms'] =& XorgSession::make_perms($level); + http_redirect(empty($_SERVER['HTTP_REFERER']) ? './' : $_SERVER['HTTP_REFERER']); + } - pl_redirect('/'); + function handler_kill_sessions($page) + { + kill_sessions(); } - function handler_bug(&$page) + function handler_bug($page) { global $globals; - $page->changeTpl('core/bug.tpl', SIMPLE); + + if (empty($_SERVER['HTTP_REFERER'])) { + // We don't have a valid referer, we need to use the url + list($currentPage, $location) = explode('//', $_SERVER['REQUEST_URI'], 2); + + $location = 'http'.(empty($_SERVER['HTTPS']) ? '' : 's').'://'.$_SERVER['SERVER_NAME'].'/'.$location; + } else { + $location = $_SERVER['HTTP_REFERER']; + } + + $page->coreTpl('bug.tpl', SIMPLE); + $page->assign('location', $location); $page->addJsLink('close_on_esc.js'); - if (Env::has('send') && trim(Env::v('detailed_desc')) && S::has_xsrf_token()) { + + 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" - . "Utilisateur : " . 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); + $page->assign('bug_sent', 1); + $page->trigSuccess('Ton message a bien été envoyé au support de ' . $globals->core->sitename + . ', 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(); - $mymail->setFrom('"'.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->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(); - } elseif (Env::has('send') && S::has_xsrf_token()) { - $page->trig("Merci de remplir une explication du problème rencontré"); } elseif (Env::has('send')) { - $page->trig("L'envoi du bug a échoué, merci de réessayer."); + $page->trigError("Merci de remplir une explication du problème rencontré."); } } - function handler_wiki_help(&$page, $action = 'title') + function handler_wiki_help($page, $action = 'title') { - $page->changeTpl('core/wiki.help.tpl', SIMPLE); + $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'); + if (Post::has('clear')) { + PlErrorReport::clear(); + $page->trigSuccess("Erreurs effacées."); + } + $page->assign('errors', PlErrorReport::iterate()); + } + + function handler_embedded($page) + { + global $platal, $globals; + $allkeys = func_get_args(); + $mode = $allkeys[1]; + unset($allkeys[0]); + unset($allkeys[1]); + $_REQUEST['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: