X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=bin%2Fnewsletter.send.php;h=c5c8178abb9251d2cee5e1dad83c48cc8c1df2c4;hb=5f30b30e8b2657ade5c727e98de286386ee002d8;hp=e12c2629f6852bc4b5fb9ddce7ec3d1b74718111;hpb=ee68ddc1d2ff14e755623de27336cfc40fb0a29a;p=platal.git

diff --git a/bin/newsletter.send.php b/bin/newsletter.send.php
index e12c262..c5c8178 100755
--- a/bin/newsletter.send.php
+++ b/bin/newsletter.send.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php5 -q
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -20,8 +20,9 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require('./connect.db.inc.php');
-require("newsletter.inc.php");
+require_once('./connect.db.inc.php');
+require_once('../classes/plmailer.php');
+require_once("newsletter.inc.php");
 
 $opt = getopt('i:h');
 
@@ -35,31 +36,7 @@ EOF;
 
 $id = intval($opt['i']);
 $nl = new NewsLetter($id);
-$nl->setSent();
-
-while(true) {
-    $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
-               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  aliases         AS a  ON(u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags))
-          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');
-    }
-    XDB::execute('UPDATE newsletter_ins SET last={?} WHERE '.implode(' OR ', $sent), $id);
-    sleep(60);
-}
+$nl->sendToAll();
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>