From: Stéphane Jacob <sj@m4x.org>
Date: Thu, 28 Oct 2010 07:06:26 +0000 (+0200)
Subject: Only sends profile modification notification emails if there are some modifications.
X-Git-Tag: xorg/1.0.2~179
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d6c464056199e17ce8d304b54dbdaad498245a39;p=platal.git

Only sends profile modification notification emails if there are some modifications.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/bin/cron/profile_modification.php b/bin/cron/profile_modification.php
index 0aa2172..6e856e5 100755
--- a/bin/cron/profile_modification.php
+++ b/bin/cron/profile_modification.php
@@ -33,56 +33,58 @@ $res = XDB::iterator('SELECT  p.hrpid, pm.pid, a.full_name, pm.field, pm.oldText
                   INNER JOIN  aliases               AS al ON (ap.uid = al.uid AND FIND_IN_SET(\'bestalias\', al.flags))
                     ORDER BY  pm.pid, pm.field');
 
-$date = time();
-$values = $res->next();
+if ($res-total() > 0) {
+    $date = time();
+    $values = $res->next();
 
-$pid = $values['pid'];
-$sex = ($values['sex'] == 'female') ? 1 : 0;
-$yourself = $values['yourself'];
-$alias = $values['alias'];
-$hrpid = $values['hrpid'];
-$modifications = array();
-$modifications[] = array(
-    'full_name' => $values['full_name'],
-    'field'     => $values['field'],
-    'oldText'   => $values['oldText'],
-    'newText'   => $values['newText'],
-);
-
-while ($values = $res->next()) {
-    if ($values['pid'] != $pid) {
-        $mailer = new PlMailer('profile/notification.mail.tpl');
-        $mailer->addTo($alias . '@' . $globals->mail->domain);
-        $mailer->assign('modifications', $modifications);
-        $mailer->assign('yourself', $yourself);
-        $mailer->assign('hrpid', $hrpid);
-        $mailer->assign('sex', $sex);
-        $mailer->assign('date', $date);
-        $mailer->send();
-        $modifications = array();
-    }
     $pid = $values['pid'];
     $sex = ($values['sex'] == 'female') ? 1 : 0;
     $yourself = $values['yourself'];
     $alias = $values['alias'];
     $hrpid = $values['hrpid'];
+    $modifications = array();
     $modifications[] = array(
         'full_name' => $values['full_name'],
         'field'     => $values['field'],
         'oldText'   => $values['oldText'],
         'newText'   => $values['newText'],
     );
-}
-$mailer = new PlMailer('profile/notification.mail.tpl');
-$mailer->addTo($alias . '@' . $globals->mail->domain);
-$mailer->assign('modifications', $modifications);
-$mailer->assign('yourself', $yourself);
-$mailer->assign('hrpid', $hrpid);
-$mailer->assign('sex', $sex);
-$mailer->assign('date', $date);
-$mailer->send();
 
-XDB::execute('DELETE FROM  profile_modifications');
+    while ($values = $res->next()) {
+        if ($values['pid'] != $pid) {
+            $mailer = new PlMailer('profile/notification.mail.tpl');
+            $mailer->addTo($alias . '@' . $globals->mail->domain);
+            $mailer->assign('modifications', $modifications);
+            $mailer->assign('yourself', $yourself);
+            $mailer->assign('hrpid', $hrpid);
+            $mailer->assign('sex', $sex);
+            $mailer->assign('date', $date);
+            $mailer->send();
+            $modifications = array();
+        }
+        $pid = $values['pid'];
+        $sex = ($values['sex'] == 'female') ? 1 : 0;
+        $yourself = $values['yourself'];
+        $alias = $values['alias'];
+        $hrpid = $values['hrpid'];
+        $modifications[] = array(
+            'full_name' => $values['full_name'],
+            'field'     => $values['field'],
+            'oldText'   => $values['oldText'],
+            'newText'   => $values['newText'],
+        );
+    }
+    $mailer = new PlMailer('profile/notification.mail.tpl');
+    $mailer->addTo($alias . '@' . $globals->mail->domain);
+    $mailer->assign('modifications', $modifications);
+    $mailer->assign('yourself', $yourself);
+    $mailer->assign('hrpid', $hrpid);
+    $mailer->assign('sex', $sex);
+    $mailer->assign('date', $date);
+    $mailer->send();
+
+    XDB::execute('DELETE FROM  profile_modifications');
+}
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>