Add the list of marketing in registration notification email.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/modules/register.php b/modules/register.php
index 0d717a9..69a8ae5 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -324,16 +324,20 @@ class RegisterModule extends PLModule
         /************* envoi d'un mail au démarcheur ***************/
         /***********************************************************/
         $res = XDB::iterRow(
-                "SELECT  DISTINCT sa.alias, IF(s.nom_usage,s.nom_usage,s.nom) AS nom,
-                         s.prenom, FIND_IN_SET('femme', s.flags) AS femme
+                "SELECT  sa.alias, IF(s.nom_usage,s.nom_usage,s.nom) AS nom,
+                         s.prenom, FIND_IN_SET('femme', s.flags) AS femme,
+                         GROUP_CONCAT(m.email) AS mails
                    FROM  register_marketing AS m
              INNER JOIN  auth_user_md5      AS s  ON ( m.sender = s.user_id )
              INNER JOIN  aliases            AS sa ON ( sa.id = m.sender
                                                        AND FIND_IN_SET('bestalias', sa.flags) )
-                  WHERE  m.uid = {?}", $uid);
+                  WHERE  m.uid = {?}
+               GROUP BY  m.sender", $uid);
         XDB::execute("UPDATE register_mstats SET success=NOW() WHERE uid={?}", $uid);
 
-        while (list($salias, $snom, $sprenom, $sfemme) = $res->next()) {
+        $market = array();
+        while (list($salias, $snom, $sprenom, $sfemme, $mails) = $res->next()) {
+            $market[] = " - par $snom $sprenom sur $mails";
             $mymail = new PlMailer();
             $mymail->setSubject("$prenom $nom s'est inscrit à Polytechnique.org !");
             $mymail->setFrom('"Marketing Polytechnique.org" <register@' . $globals->mail->domain . '>');
@@ -364,7 +368,10 @@ class RegisterModule extends PLModule
                  . " - email     : $email\n"
                  . " - sexe      : $femme\n"
                  . " - ip        : {$logger->ip} ({$logger->host})\n"
-                 . ($logger->proxy_ip ? " - proxy     : {$logger->proxy_ip} ({$logger->proxy_host})\n" : "");
+                 . ($logger->proxy_ip ? " - proxy     : {$logger->proxy_ip} ({$logger->proxy_host})\n" : "")
+                 . "\n\n"
+                 . "Les marketings suivants avaient été effectués :\n"
+                 . implode("\n", $market);
             $mymail->setTxtBody($msg);
             $mymail->send();
         }