X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=bin%2Fcron%2Fnotifs.send.php;fp=bin%2Fcron%2Fnotifs.send.php;h=939b558e524fec4d4ad9a7bf1311974e416fde1a;hb=0afc098bcd8218a807ecdc51857143e2aae6e662;hp=a9958e40a679263df8f88205e01ab5f8d46c75b9;hpb=5fcc1e0eccd194888bc15fcdecddf47ca560e110;p=platal.git

diff --git a/bin/cron/notifs.send.php b/bin/cron/notifs.send.php
index a9958e4..939b558 100755
--- a/bin/cron/notifs.send.php
+++ b/bin/cron/notifs.send.php
@@ -24,16 +24,25 @@ require_once 'connect.db.inc.php';
 require_once 'plmailer.php';
 require_once 'notifs.inc.php';
 
-$all = new AllNotifs();
+$uids = XDB::query('SELECT  uid
+                      FROM  watch
+                     WHERE  FIND_IN_SET(\'mail\', flags)
+                  ORDER BY  uid');
+$iterator = User::iterOverUIDs($uids->fetchColumn());
 
 $mailer = new PlMailer('carnet/notif.mail.tpl');
-foreach ($all->_data as $u) {
-    $mailer = new PlMailer('carnet/notif.mail.tpl');
-    $mailer->assign('u', $u);
-    $mailer->assign('week', date("W - Y"));
-    $mailer->assign('cats', $all->_cats);
-    $mailer->addTo('"' . $u['prenom'] . ' ' . $u['nom'] . '" <' . $u['bestalias'] . '@polytechnique.org>');
-    $mailer->send($u['mail_fmt'] == 'html');
+while($user = $iterator->next()) {
+    if (Watch::getCount($user) > 0) {
+        $notifs = Watch::getEvents($user, time() - (7 * 86400));
+        $mailer->assign('sex', $user->profile()->isFemale());
+        $mailer->assign('yourself', $user->profile()->yourself);
+        $mailer->assign('week', date('W - Y'));
+        $mailer->assign('notifs', $notifs);
+        $mailer->addTo('"' . $user->full_name . '" <' . $user->bestalias . '>');
+        $mailer->send($user->email_format == 'html');
+        unset($notifs);
+    }
+    unset($user);
 }
 
 XDB::execute("UPDATE  watch_profile