Merge branch 'platal-0.9.16'

[platal.git] / modules / core.php

diff --git a/modules/core.php b/modules/core.php
index 663af58..f044d9b 100644 (file)
--- a/modules/core.php
+++ b/modules/core.php
@@ -37,6 +37,7 @@ class CoreModule extends PLModule
 
             '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),
         );
     }
 
@@ -77,18 +78,28 @@ 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)
     {
-        if (S::has_xsrf_token()) {
-            require_once 'wiki.inc.php';
+        require_once 'wiki.inc.php';
+        S::assert_xsrf_token();
 
-            $page->clear_compiled_tpl();
-            wiki_clear_all_cache();
+        $page->clear_compiled_tpl();
+        wiki_clear_all_cache();
 
-            http_redirect(empty($_SERVER['HTTP_REFERER']) ? './' : $_SERVER['HTTP_REFERER']);
-        } else {
-            $page->kill("La purge du cache a échouée, merci de réessayer.");
-        }
+        http_redirect(empty($_SERVER['HTTP_REFERER']) ? './' : $_SERVER['HTTP_REFERER']);
     }
 
     function handler_kill_sessions(&$page)
@@ -116,7 +127,9 @@ class CoreModule extends PLModule
         global $globals;
         $page->changeTpl('core/bug.tpl', SIMPLE);
         $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"
@@ -131,10 +144,8 @@ class CoreModule extends PLModule
             $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->trig("Merci de remplir une explication du problème rencontré");
         }
     }