X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fnotifs.inc.php;h=4d8013cb5574c3804718debeee1eef09fe97fecc;hb=0f5f1b707d93b4dc8c5875c2129bb38fcd186563;hp=3e173e9254c7abd83f3fff5923558a8c1246bf5c;hpb=e6957dafee1297718de163811e14cbafedae2cc0;p=platal.git

diff --git a/include/notifs.inc.php b/include/notifs.inc.php
index 3e173e9..4d8013c 100644
--- a/include/notifs.inc.php
+++ b/include/notifs.inc.php
@@ -1,6 +1,6 @@
 <?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   *
@@ -46,19 +46,19 @@ abstract class WatchOperation
 
     abstract protected function buildCondition(Watch $watch);
     abstract public function getOrder();
-    abstract public function getDate(PlUser &$user);
+    abstract public function getDate(PlUser $user);
 
-    public function publicationDate(PlUser &$user)
+    public function publicationDate(PlUser $user)
     {
         return $this->getDate($user);
     }
 
-    public function seen(PlUser &$user, $last)
+    public function seen(PlUser $user, $last)
     {
         return strtotime($this->getDate($user)) > $last;
     }
 
-    public function getData(PlUser &$user)
+    public function getData(PlUser $user)
     {
         return null;
     }
@@ -70,16 +70,19 @@ class WatchProfileUpdate extends WatchOperation
 
     public $flag  = 'profile';
     public $title = 'Mise$s à jour de fiche';
+    private $date = null;
 
-    public static function register(Profile &$profile, $field)
+    public static function register(Profile $profile, $field)
     {
-        XDB::execute('REPLACE INTO  watch_profile (pid, ts, field)
-                            VALUES  ({?}, NOW(), {?})',
+        XDB::execute('INSERT INTO  watch_profile (pid, ts, field)
+                           VALUES  ({?}, NOW(), {?})
+          ON DUPLICATE KEY UPDATE  ts = NOW()',
                      $profile->id(), $field);
     }
 
     protected function buildCondition(Watch $watch)
     {
+        $this->date = $watch->date();
         return new PFC_And(new UFC_ProfileUpdated('>', $watch->date()),
                            $watch->contactCondition());
     }
@@ -92,29 +95,12 @@ class WatchProfileUpdate extends WatchOperation
         return self::$order;
     }
 
-    public function getDate(PlUser &$user)
+    public function getDate(PlUser $user)
     {
         return $user->profile()->last_change;
     }
 
-    static private $descriptions = array('search_names' => 'L\'un de ses noms',
-                                         'freetext'     => 'Le texte libre',
-                                         'mobile'       => 'Son numéro de téléphone portable',
-                                         'nationalite'  => 'Sa nationalité',
-                                         'nationalite2' => 'Sa seconde nationalité',
-                                         'nationalite3' => 'Sa troisième nationalité',
-                                         'nick'         => 'Son surnom',
-                                         'networking'   => 'La liste de ses adresses de networking',
-                                         'edus'         => 'Ses formations',
-                                         'addresses'    => 'Ses adresses',
-                                         'section'      => 'Sa section sportive',
-                                         'binets'       => 'La liste de ses binets',
-                                         'medals'       => 'Ses décorations',
-                                         'cv'           => 'Son Curriculum Vitae',
-                                         'corps'        => 'Son Corps d\'État',
-                                         'jobs'         => 'Ses informations professionnelles',
-                                         'photo'        => 'Sa photographie');
-    public function getData(PlUser &$user)
+    public function getData(PlUser $user)
     {
         $data = XDB::fetchColumn("SELECT  field
                                     FROM  watch_profile
@@ -126,7 +112,7 @@ class WatchProfileUpdate extends WatchOperation
         } else {
             $text = array();
             foreach ($data as $f) {
-                $text[] = self::$descriptions[$f];
+                $text[] = Profile::$descriptions[$f];
             }
             return $text;
         }
@@ -155,7 +141,7 @@ class WatchRegistration extends WatchOperation
         return self::$order;
     }
 
-    public function getDate(PlUser &$user)
+    public function getDate(PlUser $user)
     {
         return $user->registration_date;
     }
@@ -183,17 +169,17 @@ class WatchDeath extends WatchOperation
         return self::$order;
     }
 
-    public function getDate(PlUser &$user)
+    public function getDate(PlUser $user)
     {
         return $user->profile()->deathdate;
     }
 
-    public function publicationDate(PlUser &$user)
+    public function publicationDate(PlUser $user)
     {
         return $user->profile()->deathdate_rec;
     }
 
-    public function seen(PlUser &$user, $last)
+    public function seen(PlUser $user, $last)
     {
         return strtotime($user->profile()->deathdate_rec) > $last;
     }
@@ -232,17 +218,17 @@ class WatchBirthday extends WatchOperation
         return self::$order;
     }
 
-    public function getDate(PlUser &$user)
+    public function getDate(PlUser $user)
     {
         return $user->profile()->next_birthday;
     }
 
-    public function publicationDate(PlUser &$user)
+    public function publicationDate(PlUser $user)
     {
         return date('Y-m-d', strtotime($user->profile()->next_birthday) - self::WATCH_LIMIT);
     }
 
-    public function seen(PlUser &$user, $last)
+    public function seen(PlUser $user, $last)
     {
         $birthday = strtotime($user->profile()->next_birthday);
         return $birthday >  $last + self::WATCH_LIMIT
@@ -360,7 +346,7 @@ class Watch
     }
 
 
-    private static function getDate(PlUser &$user, $date)
+    private static function getDate(PlUser $user, $date)
     {
         if (is_null($date)) {
             $date = $user->watchLast();
@@ -372,13 +358,13 @@ class Watch
         return $date;
     }
 
-    public static function getCount(PlUser &$user, $date = null)
+    public static function getCount(PlUser $user, $date = null)
     {
         $watch = new Watch($user, $date);
         return $watch->count();
     }
 
-    public static function getEvents(PlUser &$user, $date = null)
+    public static function getEvents(PlUser $user, $date = null)
     {
         $watch = new Watch($user, $date);
         return $watch->events();