User can't remove identification footer from bug reports

[platal.git] / modules / email.php

diff --git a/modules/email.php b/modules/email.php
index c053cfb..04677e7 100644 (file)
--- a/modules/email.php
+++ b/modules/email.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   *
@@ -97,7 +97,7 @@ class EmailModule extends PLModule
 
         $page->assign('demande', AliasReq::get_request($uid));
 
-        if ($action == 'suppr' && $value) {
+        if ($action == 'delete' && $value) {
             //Suppression d'un alias
             XDB::execute(
                 'DELETE virtual, virtual_redirect
@@ -254,6 +254,8 @@ class EmailModule extends PLModule
     function handler_antispam(&$page, $statut_filtre = null)
     {
         require_once 'emails.inc.php';
+        require_once('wiki.inc.php');
+        wiki_require_page('Xorg.Antispam');
 
         $page->changeTpl('emails/antispam.tpl');
 
@@ -266,6 +268,8 @@ class EmailModule extends PLModule
 
     function handler_submit(&$page)
     {
+        require_once('wiki.inc.php');
+        wiki_require_page('Xorg.Mails');
         $page->changeTpl('emails/submit_spam.tpl');
 
         if (Post::has('send_email')) {
@@ -335,7 +339,7 @@ class EmailModule extends PLModule
                 if (!empty($bcc)) { $mymail->addBcc($bcc); }
                 if (!empty($to2)) { $mymail->addTo($to2); }
                 if (!empty($cc2)) { $mymail->addCc($cc2); }
-                if (isset($_FILES['uploaded'])) {
+                if (is_uploaded_file($_FILES['uploaded']['tmp_name'])) {
                     $mymail->addAttachment($_FILES['uploaded']['tmp_name'],
                                            $_FILES['uploaded']['type'],
                                            $_FILES['uploaded']['name']);  
@@ -365,6 +369,8 @@ class EmailModule extends PLModule
     function handler_broken(&$page, $warn = null, $email = null)
     {
         require_once 'emails.inc.php';
+        require_once('wiki.inc.php');
+        wiki_require_page('Xorg.PatteCassée');
 
         global $globals;
 
@@ -423,12 +429,13 @@ L'
                 $page->assign('email',$email);
                 $sel = XDB::query(
                         "SELECT  e1.uid, e1.panne != 0 AS panne, count(e2.uid) AS nb_mails,
-                                 u.nom, u.prenom, u.promo
+                                 u.nom, u.prenom, u.promo, a.alias AS forlife
                            FROM  emails as e1
                       LEFT JOIN  emails as e2 ON(e1.uid = e2.uid 
                                                  AND FIND_IN_SET('active', e2.flags)
                                                  AND e1.email != e2.email)
                      INNER JOIN  auth_user_md5 as u ON(e1.uid = u.user_id)
+                     INNER JOIN  aliases AS a ON (a.id = e1.uid AND a.type = 'a_vie')
                           WHERE  e1.email = {?}
                        GROUP BY  e1.uid", $email);
                 if ($x = $sel->fetchOneAssoc()) {
@@ -442,7 +449,7 @@ L'
                     } else {
                         XDB::execute("UPDATE emails
                                          SET panne_level = 1
-                                       WHERE email = {?} AND panne_level = 0");
+                                       WHERE email = {?} AND panne_level = 0", $email);
                     }
                     $page->assign_by_ref('x', $x);
                 }