X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fmarketing.php;h=4757136066ea93b61ac238d9f83e5edb51de85fd;hb=39fd8f508829b3b5b27a1bd580e2dd1857602294;hp=19865687a6a3bfe3a6331493e23b61e99ccd6432;hpb=c441b5ed3338eed23141f510d89da30fbd81f48a;p=platal.git

diff --git a/modules/marketing.php b/modules/marketing.php
index 1986568..4757136 100644
--- a/modules/marketing.php
+++ b/modules/marketing.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   *
@@ -92,7 +92,7 @@ class MarketingModule extends PLModule
                                       WHERE user_id={?} AND perms='pending'", $uid);
 
         if (list($nom, $prenom, $promo, $matricule) = $res->fetchOneRow()) {
-            require_once('register.inc.php');
+            require_once('user.func.inc.php');
             $matricule_X = get_X_mat($matricule);
             $page->assign('nom', $nom);
             $page->assign('prenom', $prenom);
@@ -153,7 +153,7 @@ class MarketingModule extends PLModule
 
         $res = XDB::query("SELECT date, relance FROM register_pending
                                       WHERE uid = {?}", $uid);
-        if (list($pending, $relance) = $res->fetchOneCell()) {
+        if (list($pending, $relance) = $res->fetchOneRow()) {
             $page->assign('pending', $pending);
             $page->assign('relance', $relance);
         }
@@ -174,31 +174,39 @@ class MarketingModule extends PLModule
             pl_redirect('emails/redirect');
         }
 
-        $res = Xdb::query("SELECT  u.nom, u.prenom, u.promo, a.alias AS forlife
+        $res = Xdb::query("SELECT  u.nom, u.prenom, u.promo, FIND_IN_SET('femme', u.flags) AS sexe,
+                                   a.alias AS forlife, b.alias AS bestalias, e.email, e.last
                              FROM  auth_user_md5 AS u
-                       INNER JOIN  aliases       AS a ON a.id = u.user_id
-                            WHERE  a.alias = {?}", $forlife);
+                       INNER JOIN  aliases       AS a ON (a.id = u.user_id AND a.type = 'a_vie')
+                       INNER JOIN  aliases       AS b ON (b.id = u.user_id AND FIND_IN_SET('bestalias', b.flags))
+                        LEFT JOIN  emails        AS e ON (e.flags = 'active' AND e.uid = u.user_id)
+                            WHERE  a.alias = {?}
+                         ORDER BY  e.panne_level, e.last", $forlife);
         if (!$res->numRows()) {
             return PL_NOT_FOUND;
         }
         $user = $res->fetchOneAssoc();
         $page->assign('user', $user);
 
-        $email = trim(Post::v('mail'));
-        if (Post::has('valide') && strlen($email) > 0) {
-            require_once('diogenes/diogenes.hermes.inc.php');
-            $mailer = new HermesMailer();
-            $mailer->setFrom(S::v('bestalias') . '@polytechnique.org');
-            $mailer->addTo('resetpass@polytechnique.org');
-            $mailer->setSubject("Proposition d'adresse mail pour " . $user['forlife']);
-
-            $message = S::v('nom') . ' ' . S::v('prenom') . ' (X' . S::v('promo') . ') '
-                     . 'propose l\'adresse suivante pour un camarade qui n\'a plus de '
-                     . 'redirections actives :' . "\n\n"
-                     . '* ' . $user['forlife'] . ' => ' . $email . "\n";
-            $mailer->setTxtBody(wordwrap($message, 78));
-            $mailer->send();
-            $page->assign('sent', true);
+        $email = null;
+        if (Post::has('mail')) {
+            require_once 'emails.inc.php';
+            $email = valide_email(Post::v('mail'));
+        }
+        if (Post::has('valide') && isvalid_email_redirection($email)) {
+            // security stuff
+            check_email($email, "Proposition d'une adresse surveillee pour " . $user['forlife'] . " par " . S::v('forlife'));
+            if ($user['email'] && !trim(Post::v('comment'))) {
+                $page->trig("Il faut que tu ajoutes un commentaire à ta proposition pour justifier le "
+                           ."besoin de changer la redirection de " . $user['prenom']);
+            } else {
+                require_once 'validations.inc.php';
+                $valid = new BrokenReq(S::i('uid'), $user, $email, trim(Post::v('comment')));
+                $valid->submit();
+                $page->assign('sent', true);
+            }
+        } elseif ($email) {
+            $page->trig("L'adresse proposée n'est pas une adresse acceptable pour une redirection");
         }
     }
 
@@ -251,6 +259,7 @@ class MarketingModule extends PLModule
                     $page->assign('already', true);
                 } else {
                     $page->assign('ok', true);
+                    check_email($email, "Une adresse surveillée est proposée au marketing par " . S::v('forlife'));
                     XDB::execute(
                             "INSERT INTO  register_marketing (uid,sender,email,date,last,nb,type,hash)
                                   VALUES  ({?}, {?}, {?}, NOW(), 0, 0, {?}, '')",