Happy New Year!

[platal.git] / modules / email.php

diff --git a/modules/email.php b/modules/email.php
index bfcbf06..cf06908 100644 (file)
--- a/modules/email.php
+++ b/modules/email.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -106,8 +106,6 @@ class EmailModule extends PLModule
 
     function handler_alias(&$page, $action = null, $value = null)
     {
-        require_once 'validations.inc.php';
-
         global $globals;
 
         $page->changeTpl('emails/alias.tpl');
@@ -171,9 +169,9 @@ class EmailModule extends PLModule
                 }
 
                 //vérifier que l'alias n'est pas déja en demande
-                $it = new ValidateIterator();
+                $it = Validate::iterate('alias');
                 while($req = $it->next()) {
-                    if ($req->type == 'alias' and $req->alias == $alias_mail) {
+                    if ($req->alias == $alias_mail) {
                         $page->trigError("L'alias $alias_mail a déja été demandé.
                                     Tu ne peux donc pas l'obtenir pour l'instant.");
                         return ;
@@ -372,7 +370,6 @@ class EmailModule extends PLModule
     function handler_send(&$page)
     {
         $page->changeTpl('emails/send.tpl');
-        $page->addJsLink('ajax.js');
 
         $page->setTitle('Envoyer un email');
 
@@ -387,8 +384,9 @@ class EmailModule extends PLModule
                 $_POST['to_contacts'] = explode(';', @$_POST['to_contacts']);
                 $_POST['cc_contacts'] = explode(';', @$_POST['cc_contacts']);
                 $data = serialize($_POST);
-                XDB::execute("REPLACE INTO  email_send_save
-                                    VALUES  ({?}, {?})",
+                XDB::execute('INSERT INTO  email_send_save (uid, data)
+                                   VALUES  ({?}, {?})
+                  ON DUPLICATE KEY UPDATE  data = VALUES(data)',
                              S::user()->id('uid'), $data);
             }
             exit;
@@ -853,8 +851,6 @@ class EmailModule extends PLModule
             if ($list == '') {
                 $page->trigError('La liste est vide.');
             } else {
-                global $platal;
-
                 $broken_user_list = array();
                 $broken_list = explode("\n", $list);
                 sort($broken_list);
@@ -892,7 +888,7 @@ class EmailModule extends PLModule
                         if (!empty($x['nb_mails'])) {
                             $mail = new PlMailer('emails/broken.mail.tpl');
                             $mail->addTo("\"{$x['full_name']}\" <{$x['alias']}@"
-                                         . $globals->mail->domain . '>');
+                                         . Platal::globals()->mail->domain . '>');
                             $mail->assign('x', $x);
                             $mail->assign('email', $email);
                             $mail->send();
@@ -918,21 +914,27 @@ class EmailModule extends PLModule
                 // Output the list of users with recently broken addresses,
                 // along with the count of valid redirections.
                 require_once 'notifs.inc.php';
-                pl_content_headers("text/x-csv");
+                pl_cached_content_headers('text/x-csv', 1);
 
                 $csv = fopen('php://output', 'w');
-                fputcsv($csv, array('nom', 'promo', 'alias', 'bounce', 'nbmails', 'url'), ';');
+                fputcsv($csv, array('nom', 'promo', 'alias', 'bounce', 'nbmails', 'url', 'corps', 'job', 'networking'), ';');
                 foreach ($broken_user_list as $alias => $mails) {
                     $sel = Xdb::query(
-                        "SELECT  acc.uid, count(e.email) AS nb_mails,
+                        "SELECT  acc.uid, count(DISTINCT(e.email)) AS nb_mails,
                                  IFNULL(pd.public_name, acc.full_name) AS fullname,
-                                 IFNULL(pd.promo, 0) AS promo
-                           FROM  aliases          AS a
-                     INNER JOIN  accounts         AS acc ON (a.uid = acc.uid)
-                      LEFT JOIN  emails           AS e   ON (e.uid = acc.uid
-                                                             AND FIND_IN_SET('active', e.flags) AND e.panne = 0)
-                      LEFT JOIN  account_profiles AS ap  ON (acc.uid = ap.uid AND FIND_IN_SET('owner', ap.perms))
-                      LEFT JOIN  profile_display  AS pd  ON (pd.pid = ap.pid)
+                                 IFNULL(pd.promo, 0) AS promo, IFNULL(pce.name, 'Aucun') AS corps,
+                                 IFNULL(pje.name, 'Aucun') AS job, GROUP_CONCAT(pn.address SEPARATOR ', ') AS networking
+                           FROM  aliases            AS a
+                     INNER JOIN  accounts           AS acc ON (a.uid = acc.uid)
+                      LEFT JOIN  emails             AS e   ON (e.uid = acc.uid
+                                                               AND FIND_IN_SET('active', e.flags) AND e.panne = 0)
+                      LEFT JOIN  account_profiles   AS ap  ON (acc.uid = ap.uid AND FIND_IN_SET('owner', ap.perms))
+                      LEFT JOIN  profile_display    AS pd  ON (pd.pid = ap.pid)
+                      LEFT JOIN  profile_corps      AS pc  ON (pc.pid = ap.pid)
+                      LEFT JOIN  profile_corps_enum AS pce ON (pc.current_corpsid = pce.id)
+                      LEFT JOIN  profile_job        AS pj  ON (pj.pid = ap.pid)
+                      LEFT JOIN  profile_job_enum   AS pje ON (pj.jobid = pje.id)
+                      LEFT JOIN  profile_networking AS pn  ON (pn.pid = ap.pid)
                           WHERE  a.alias = {?}
                        GROUP BY  acc.uid", $alias);
 
@@ -944,7 +946,8 @@ class EmailModule extends PLModule
                         }
                         fputcsv($csv, array($x['fullname'], $x['promo'], $alias,
                                             join(',', $mails), $x['nb_mails'],
-                                            'https://www.polytechnique.org/marketing/broken/' . $alias), ';');
+                                            'https://www.polytechnique.org/marketing/broken/' . $alias,
+                                            $x['corps'], $x['job'], $x['networking']), ';');
                     }
                 }
                 fclose($csv);