Merge branch 'xorg/maint' into xorg/1.0.2/master

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

diff --git a/include/notifs.inc.php b/include/notifs.inc.php
index 3e173e9..b114ae5 100644 (file)
--- a/include/notifs.inc.php
+++ b/include/notifs.inc.php
@@ -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)
     {
-        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());
     }
@@ -97,23 +100,6 @@ class WatchProfileUpdate extends WatchOperation
         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)
     {
         $data = XDB::fetchColumn("SELECT  field
@@ -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;
         }