Ban dangerous on subscription

[platal.git] / modules / core.php

diff --git a/modules/core.php b/modules/core.php
index ed58bac..4e98a8f 100644 (file)
--- a/modules/core.php
+++ b/modules/core.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -49,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());
     }
 
@@ -102,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);
 
@@ -111,6 +103,7 @@ class CoreModule extends PLModule
 
     function handler_bug(&$page)
     {
+        global $globals;
         $page->changeTpl('core/bug.tpl', SIMPLE);
         $page->addJsLink('close_on_esc.js');
         if (Env::has('send') && trim(Env::v('detailed_desc'))) {
@@ -122,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();