Uses trig utilities whenever it is possible.

[platal.git] / modules / core.php

diff --git a/modules/core.php b/modules/core.php
index f044d9b..b0d5f2a 100644 (file)
--- a/modules/core.php
+++ b/modules/core.php
@@ -51,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)
@@ -93,11 +95,10 @@ class CoreModule extends PLModule
 
     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']);
     }
@@ -114,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('/');
     }
@@ -125,8 +131,20 @@ 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();
 
@@ -136,7 +154,10 @@ class CoreModule extends PLModule
                   . "Utilisateur : " . 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 . '>');
             $mymail->addTo('support+platal@' . $globals->mail->domain);
@@ -145,13 +166,13 @@ class CoreModule extends PLModule
             $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'));
     }