From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Sun, 24 Feb 2013 23:24:08 +0000 (+0100)
Subject: Don't notify birthday of dead people.
X-Git-Tag: xorg/1.1.8~19
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=eed969f5713bbbfc0b12e3b43cce03b55497d7b8;p=platal.git

Don't notify birthday of dead people.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---

diff --git a/include/notifs.inc.php b/include/notifs.inc.php
index e08a723..3899308 100644
--- a/include/notifs.inc.php
+++ b/include/notifs.inc.php
@@ -198,6 +198,7 @@ class WatchBirthday extends WatchOperation
 
     protected function buildCondition(Watch $watch)
     {
+        $not_dead = new PFC_Not(new UFC_Dead());
         $select_date = new PFC_OR(new UFC_Birthday('=', time()),
                                   new PFC_And(new UFC_Birthday('<=', time() + self::WATCH_LIMIT),
                                               new UFC_Birthday('>', $watch->date() + self::WATCH_LIMIT)));
@@ -210,7 +211,7 @@ class WatchBirthday extends WatchOperation
                                            new UFC_Promo('<=', $profile->mainGrade(), $profile->yearpromo() + 1)),
                                $watch->groupCondition());
         }
-        return new PFC_And($select_date, $cond);
+        return new PFC_And($not_dead, $select_date, $cond);
     }
 
     public function getOrder()