AXSpammer cron

[platal.git] / modules / email.php

diff --git a/modules/email.php b/modules/email.php
index 19cd346..1badbd8 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   *
@@ -30,6 +30,7 @@ class EmailModule extends PLModule
             'emails/broken'   => $this->make_hook('broken', AUTH_COOKIE),
             'emails/redirect' => $this->make_hook('redirect', AUTH_MDP),
             'emails/send'     => $this->make_hook('send', AUTH_MDP),
+            'emails/antispam/submit'  => $this->make_hook('submit', AUTH_COOKIE),
 
             'admin/emails/duplicated' => $this->make_hook('duplicated', AUTH_MDP, 'admin')
         );
@@ -96,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
@@ -253,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');
 
@@ -263,6 +266,33 @@ class EmailModule extends PLModule
         $page->assign('filtre',$bogo->level());
     }
 
+    function handler_submit(&$page)
+    {
+        $page->changeTpl('emails/submit_spam.tpl');
+
+        if (Post::has('send_email')) {
+            $upload = $_FILES['mail']['tmp_name'];
+            if (!is_uploaded_file($upload)) {
+                $page->trig('Une erreur a été rencontrée lors du transfert du fichier');
+                return;
+            }
+            $mime = mime_content_type($upload);
+            if ($mime != 'text/x-mail' && $mime != 'message/rfc822') {
+                $page->trig('Le fichier ne contient pas un mail complet');
+                return;
+            }
+            global $globals;
+            $box    = Post::v('type') . '@' . $globals->mail->domain;
+            $mailer = new PlMailer();
+            $mailer->addTo($box);
+            $mailer->setFrom('"' . S::v('prenom') . ' ' . S::v('nom') . '" <web@' . $globals->mail->domain . '>');
+            $mailer->setTxtBody(Post::v('type') . ' soumis par ' . S::v('forlife') . ' via le web');
+            $mailer->addAttachment($upload, 'message/rfc822', $_FILES['mail']['name']);
+            $mailer->send();
+            $page->trig('Le message a été transmis à ' . $box);
+        }
+    }
+
     function handler_send(&$page)
     {
         global $globals;
@@ -274,7 +304,21 @@ class EmailModule extends PLModule
         // action si on recoit un formulaire
         if (Env::v('submit') == 'Envoyer')
         {
-            $to2  = join(', ', Env::v('contacts', Array()));
+            function getEmails($aliases)
+            {
+                if (!is_array($aliases)) {
+                    return null;
+                }
+                $rel = Env::v('contacts');
+                $ret = array();
+                foreach ($aliases as $alias) {
+                    $ret[$alias] = $rel[$alias];
+                }
+                return join(', ', $ret);
+            }
+
+            $to2  = getEmails(Env::v('to_contacts'));
+            $cc2  = getEmails(Env::v('cc_contacts'));
             $txt  = str_replace('^M', '', Env::v('contenu'));
             $to   = Env::v('to');
             $subj = Env::v('sujet');
@@ -285,16 +329,19 @@ class EmailModule extends PLModule
             if (empty($to) && empty($cc) && empty($to2)) {
                 $page->trig("Indique au moins un destinataire.");
             } else {
-                require_once("diogenes/diogenes.hermes.inc.php");
-
-                $mymail = new HermesMailer();
+                $mymail = new PlMailer();
                 $mymail->setFrom($from);
                 $mymail->setSubject($subj);
                 if (!empty($to))  { $mymail->addTo($to); }
                 if (!empty($cc))  { $mymail->addCc($cc); }
                 if (!empty($bcc)) { $mymail->addBcc($bcc); }
                 if (!empty($to2)) { $mymail->addTo($to2); }
-                $mymail->addHeader('X-XOrg-Login', S::v('bestalias') . '@' . $globals->mail->domain);
+                if (!empty($cc2)) { $mymail->addCc($cc2); }
+                if (is_uploaded_file($_FILES['uploaded']['tmp_name'])) {
+                    $mymail->addAttachment($_FILES['uploaded']['tmp_name'],
+                                           $_FILES['uploaded']['type'],
+                                           $_FILES['uploaded']['name']);  
+                }
                 $mymail->setTxtBody(wordwrap($txt,72,"\n"));
                 if ($mymail->send()) {
                     $page->trig("Ton mail a bien été envoyé.");
@@ -357,8 +404,7 @@ consulter la page <{$globals->baseurl}/emails/broken>.
 A bientôt sur Polytechnique.org !
 L'équipe d'administration <support@polytechnique.org>";
 
-                require_once("diogenes/diogenes.hermes.inc.php");
-                $mail = new HermesMailer();
+                $mail = new PlMailer();
                 $mail->setFrom('"Polytechnique.org" <support@polytechnique.org>');
                 $mail->addTo("$dest@polytechnique.org");
                 $mail->setSubject("Une de tes adresse de redirection Polytechnique.org ne marche plus !!");