X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcore.php;h=db4c7a143d029442369a2142eb76419803bc8942;hb=029135c8d7891915fb00fdc5352ba57dc5fa2837;hp=4e98a8fb589a85a2a4c032e3b2530346de596c66;hpb=a7c29df3b9bf8f3c3b23fec0f1d2feb814cb61fe;p=platal.git

diff --git a/modules/core.php b/modules/core.php
index 4e98a8f..db4c7a1 100644
--- a/modules/core.php
+++ b/modules/core.php
@@ -29,6 +29,7 @@ class CoreModule extends PLModule
             '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'),
 
             'wiki_help'    => $this->make_hook('wiki_help', AUTH_PUBLIC),
@@ -36,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),
         );
     }
 
@@ -49,15 +51,17 @@ class CoreModule extends PLModule
     {
         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)
     {
         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)
@@ -76,16 +80,34 @@ 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();
+        PlWikiPage::clearCache();
 
         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')) {
@@ -93,10 +115,15 @@ class CoreModule extends PLModule
         }
 
         if (isset($_SESSION['log'])) {
-            $_SESSION['log']->log("suid_start", "login by ".S::v('forlife'));
+            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'));
+            }
         }
-        $_SESSION['suid'] = $_SESSION;
-        $_SESSION['perms'] =& XorgSession::make_perms($level);
+        Platal::session()->startSUID(S::i('uid'));
+        Platal::session()->makePerms($level);
 
         pl_redirect('/');
     }
@@ -104,31 +131,55 @@ class CoreModule extends PLModule
     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::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::v('forlife') . "\n"
+                  . "Utilisateur : " . (S::user() ? S::user()->login() : S::v('forlife')) . "\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 . '>');
+            // 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->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')) {
-            $page->trig("Merci de remplir une explication du problème rencontré");
+            $page->trigError("Merci de remplir une explication du problème rencontré.");
         }
     }
 
     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'));
     }