Make addFirefoxEngine global

[platal.git] / modules / core.php

diff --git a/modules/core.php b/modules/core.php
index 0fec9e2..cbb1613 100644 (file)
--- a/modules/core.php
+++ b/modules/core.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -43,16 +43,25 @@ class CoreModule extends PLModule
 
     function handler_403(&$page)
     {
+        global $globals;
         header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
-        $page->changeTpl('core/403.tpl');
+        if (!empty($GLOBALS['IS_XNET_SITE']) && $globals->asso()) {
+            new_skinned_page('core/403.tpl');
+        } else {
+            $page->changeTpl('core/403.tpl');
+        }
     }
 
     function handler_404(&$page)
     {
-        global $platal;
+        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->assign('near', $platal->near_hook());
-        $page->changeTpl('core/404.tpl');
     }
 
     function handler_favicon(&$page)
@@ -92,14 +101,22 @@ class CoreModule extends PLModule
     {
         $page->changeTpl('core/bug.tpl',SIMPLE);
         $page->addJsLink('close_on_esc.js');
-        if (Env::has('send')) {
+        if (Env::has('send') && trim(Env::v('detailed_desc'))) {
+            $body = wordwrap(Env::v('detailed_desc'), 78) . "\n\n"
+                  . "----------------------------\n"
+                  . "Page        : " . Env::v('page') . "\n\n"
+                  . "Utilisateur : " . S::v('forlife') . "\n"
+                  . "Navigateur  : " . Env::v('browser') . "\n"
+                  . "Skin        : " . Env::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->setSubject('Plat/al '.Env::v('task_type').' : '.Env::v('item_summary'));
-            $mymail->setTxtBody(Env::v('detailed_desc'));
+            $mymail->setTxtBody($body);
             $mymail->send();
+        } elseif (Env::has('send')) {
+            $page->trig("Merci de remplir une explication du problème rencontré");
         }
     }
 }