Merge branch 'master' of /home/git/platal into profile_edit

[platal.git] / modules / core.php

diff --git a/modules/core.php b/modules/core.php
index 2165d27..ac99545 100644 (file)
--- a/modules/core.php
+++ b/modules/core.php
@@ -31,6 +31,9 @@ class CoreModule extends PLModule
             'purge_cache' => $this->make_hook('purge_cache', 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),
         );
@@ -46,22 +49,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());
     }
 
@@ -99,7 +94,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,7 +103,8 @@ 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'))) {
             $body = wordwrap(Env::v('detailed_desc'), 78) . "\n\n"
@@ -119,8 +115,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 +125,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: