X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=bin%2Fnewsletter.send.php;h=e12c2629f6852bc4b5fb9ddce7ec3d1b74718111;hb=94b4c0d4f5a72f0c4ff1a0f5671f7d94edf726d9;hp=15b335908314fc830e9f6928c97a74aabad84093;hpb=50a40a33a496131e817df875607ea5542d096a64;p=platal.git

diff --git a/bin/newsletter.send.php b/bin/newsletter.send.php
index 15b3359..e12c262 100755
--- a/bin/newsletter.send.php
+++ b/bin/newsletter.send.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php4 -q
+#!/usr/bin/php5 -q
 <?php
 /***************************************************************************
  *  Copyright (C) 2003-2006 Polytechnique.org                              *
@@ -38,25 +38,27 @@ $nl = new NewsLetter($id);
 $nl->setSent();
 
 while(true) {
-    $res = $globals->xdb->iterRow(
+    $res = XDB::iterRow(
             "SELECT  ni.user_id, a.alias,
                      u.prenom, IF(u.nom_usage='', u.nom, u.nom_usage),
                      FIND_IN_SET('femme', u.flags),
-		     q.core_mail_fmt AS pref
+                     q.core_mail_fmt AS pref
                FROM  newsletter_ins  AS ni
          INNER JOIN  auth_user_md5   AS u  USING(user_id)
-	 INNER JOIN  auth_user_quick AS q  ON(q.user_id = u.user_id)
+         INNER JOIN  auth_user_quick AS q  ON(q.user_id = u.user_id)
          INNER JOIN  aliases         AS a  ON(u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags))
-              WHERE  ni.last<{?}
+          LEFT JOIN  emails          AS e  ON(e.uid=u.user_id AND e.flags='active')
+              WHERE  ni.last<{?} AND e.email IS NOT NULL
+           GROUP BY  ni.user_id
               LIMIT  60", $id);
     if (!$res->total()) { exit; }
 
     $sent = Array();
     while (list($uid, $bestalias, $prenom, $nom, $sexe, $fmt) = $res->next()) {
-	$sent[] = "user_id='$uid'";
-	$nl->sendTo($prenom, $nom, $bestalias, $sexe, $fmt=='html');
+        $sent[] = "user_id='$uid'";
+        $nl->sendTo($prenom, $nom, $bestalias, $sexe, $fmt=='html');
     }
-    $globals->xdb->execute('UPDATE newsletter_ins SET last={?} WHERE '.implode(' OR ', $sent), $id);
+    XDB::execute('UPDATE newsletter_ins SET last={?} WHERE '.implode(' OR ', $sent), $id);
     sleep(60);
 }