Merge commit 'origin/master' into account

[platal.git] / include / notifs.inc.php

diff --git a/include/notifs.inc.php b/include/notifs.inc.php
index 6601c1e..ec9d8bf 100644 (file)
--- a/include/notifs.inc.php
+++ b/include/notifs.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -36,7 +36,7 @@ abstract class WatchOperation
     {
         $this->date = $date;
         if (!$user->watch($this->flag)) {
-            return new UFC_False();
+            return new PFC_False();
         } else {
             return $this->buildCondition($user);
         }
@@ -76,7 +76,7 @@ class WatchProfileUpdate extends WatchOperation
 
     protected function buildCondition(PlUser &$user)
     {
-        return new UFC_And(new UFC_ProfileUpdated('>', $this->date),
+        return new PFC_And(new UFC_ProfileUpdated('>', $this->date),
                            new UFC_WatchContact($user));
     }
 
@@ -133,8 +133,8 @@ class WatchRegistration extends WatchOperation
 
     protected function buildCondition(PlUser &$user)
     {
-        return new UFC_And(new UFC_Registered(false, '>', $this->date),
-                           new UFC_Or(new UFC_WatchContact($user),
+        return new PFC_And(new UFC_Registered(false, '>', $this->date),
+                           new PFC_Or(new UFC_WatchContact($user),
                                       new UFC_WatchPromo($user)));
     }
 
@@ -156,8 +156,8 @@ class WatchDeath extends WatchOperation
 
     protected function buildCondition(PlUser &$user)
     {
-        return new UFC_And(new UFC_Dead('>', $this->date, true),
-                           new UFC_Or(new UFC_WatchPromo($user),
+        return new PFC_And(new UFC_Dead('>', $this->date, true),
+                           new PFC_Or(new UFC_WatchPromo($user),
                                       new UFC_WatchContact($user)));
     }
 
@@ -191,10 +191,10 @@ class WatchBirthday extends WatchOperation
 
     protected function buildCondition(PlUser &$user)
     {
-        return new UFC_And(new UFC_OR(new UFC_Birthday('=', time()),
-                                      new UFC_And(new UFC_Birthday('<=', time() + self::WATCH_LIMIT),
+        return new PFC_And(new PFC_OR(new UFC_Birthday('=', time()),
+                                      new PFC_And(new UFC_Birthday('<=', time() + self::WATCH_LIMIT),
                                                   new UFC_Birthday('>', $this->date + self::WATCH_LIMIT))),
-                           new UFC_Or(new UFC_WatchPromo($user),
+                           new PFC_Or(new UFC_WatchPromo($user),
                                       new UFC_WatchContact($user)));
     }