X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=bin%2Fcron%2Fregistrations.php;h=825ed62015fe8dec52b03087ff16b7751b15007c;hb=3424387cde6c635ff16c3b5459c4caa88bb76e2e;hp=3b997a15a338a3dae16cb145a2e70191e9062e43;hpb=36d2dab7af85c9cd8f485488fed69328dbf64598;p=platal.git

diff --git a/bin/cron/registrations.php b/bin/cron/registrations.php
index 3b997a1..825ed62 100755
--- a/bin/cron/registrations.php
+++ b/bin/cron/registrations.php
@@ -5,39 +5,42 @@ require 'connect.db.inc.php';
 
 $message = '';
 
-$res = XDB::iterRow("SELECT  al.alias, pd.promo, e.email
-                       FROM  accounts AS a
-                 INNER JOIN  account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET('owner', ap.perms))
-                 INNER JOIN  profile_display  AS pd ON (ap.pid = pd.pid)
-                  LEFT JOIN  aliases          AS al ON (a.uid =a.uid AND al.type = 'a_vie')
-                  LEFT JOIN  emails           AS e  ON (a.uid = e.uid AND NOT FIND_IN_SET('filter', e.flags))
+$res = XDB::iterRow("SELECT  DATE(a.registration_date), a.hruid, GROUP_CONCAT(DISTINCT r.redirect SEPARATOR ', ')
+                       FROM  accounts               AS a
+                 INNER JOIN  account_profiles       AS ap ON (ap.uid = a.uid AND FIND_IN_SET('owner', ap.perms))
+                 INNER JOIN  profile_display        AS pd ON (ap.pid = pd.pid)
+                  LEFT JOIN  email_source_account   AS s  ON (a.uid = s.uid)
+                  LEFT JOIN  email_redirect_account AS r  ON (a.uid = r.uid)
                       WHERE  a.registration_date > {?}
-                   GROUP BY  al.alias
+                   GROUP BY  a.hruid
                    ORDER BY  pd.promo",
        date("Ymd000000", strtotime('last Monday')));
 if ($count = $res->total()) {
-    $message .= "$count INSCRIPTIONS CONFIRMÉES :\n";
-    while (list($forlife, $promo, $email) = $res->next()) {
-	      $message .= "$promo, $forlife, $email\n";
+    $message .= "$count INSCRIPTIONS CONFIRMÉES CETTE SEMAINE :\n";
+    while (list($date, $hruid, $email, $redirect) = $res->next()) {
+	      $message .= "$date, $hruid, $email, $redirect\n";
     }
 }
 
-$res = XDB::iterRow("SELECT  a.hruid, r.email, r.date
+$res = XDB::iterRow("SELECT  r.date, a.hruid, r.email
                        FROM  register_pending AS r
                  INNER JOIN  accounts         AS a ON (a.uid = r.uid)
+                 INNER JOIN  account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET('owner', ap.perms))
+                 INNER JOIN  profile_display  AS pd ON (ap.pid = pd.pid)
                       WHERE  r.hash != 'INSCRIT'
-                   ORDER BY  r.date");
+                   GROUP BY  a.hruid
+                   ORDER BY  pd.promo");
 if ($count = $res->total()) {
     $message .= "\n$count INSCRIPTIONS NON CONFIRMÉES :\n";
-    while (list($forlife, $email, $date) = $res->next()) {	
-	      $message .= "$date, $forlife,\n            $email\n";
+    while (list($date, $hruid, $email) = $res->next()) {	
+	      $message .= "$date, $hruid, $email\n";
     }
 }
 
 $res = XDB::query('SELECT  COUNT(DISTINCT uid), COUNT(*)
                      FROM  register_marketing');
 list($a, $b) = $res->fetchOneRow();
-$message .= "\nINSCRIPTIONS SOLICITÉES :\n";
+$message .= "\nINSCRIPTIONS SOLLICITÉES :\n";
 $message .= "    $a utilisateurs\n    $b adresses email\n";
 
 $message .= "\n\n";
@@ -49,5 +52,5 @@ $mailer->addTo($globals->register->notif);
 $mailer->setTxtBody($message);
 $mailer->send();
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>