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

diff --git a/bin/cron/notifs.send.php b/bin/cron/notifs.send.php
index 939b558..a68cc90 100755
--- a/bin/cron/notifs.send.php
+++ b/bin/cron/notifs.send.php
@@ -1,7 +1,7 @@
 #!/usr/bin/php5 -q
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -23,6 +23,7 @@
 require_once 'connect.db.inc.php';
 require_once 'plmailer.php';
 require_once 'notifs.inc.php';
+ini_set('memory_limit', '128M');
 
 $uids = XDB::query('SELECT  uid
                       FROM  watch
@@ -30,18 +31,20 @@ $uids = XDB::query('SELECT  uid
                   ORDER BY  uid');
 $iterator = User::iterOverUIDs($uids->fetchColumn());
 
-$mailer = new PlMailer('carnet/notif.mail.tpl');
 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);
+    $watch = new Watch($user);
+    if ($watch->count() > 0) {
+        $notifs = $watch->events();
+        $mailer = new PlMailer('carnet/notif.mail.tpl');
+        $mailer->assign('sex', $user->isFemale());
+        $mailer->assign('yourself', $user->display_name);
         $mailer->assign('week', date('W - Y'));
         $mailer->assign('notifs', $notifs);
-        $mailer->addTo('"' . $user->full_name . '" <' . $user->bestalias . '>');
-        $mailer->send($user->email_format == 'html');
+        $mailer->sendTo($user);
+        unset($mailer);
         unset($notifs);
     }
+    unset($watch);
     unset($user);
 }