REPLACE INTO should only be used if the data deletion is wanted.

[platal.git] / modules / profile / page.inc.php

diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php
index d834f04..ec70a0e 100644 (file)
--- a/modules/profile/page.inc.php
+++ b/modules/profile/page.inc.php
@@ -118,9 +118,13 @@ class ProfileSettingPhones implements ProfileSetting
                 $phones[] = $phone->toFormArray();
             }
             return $phones;
+        } else {
+            $phones = Phone::formatFormArray($value, $success);
+            if (!$success) {
+                Platal::page()->trigError('Numéro de téléphone invalide');
+            }
+            return $phones;
         }
-
-        return Phone::formatFormArray($value, $success);
     }
 
     public function save(ProfilePage &$page, $field, $value)
@@ -170,12 +174,23 @@ class ProfileSettingBool extends ProfileNoSave
 
 class ProfileSettingDate extends ProfileNoSave
 {
+    private $allowEmpty;
+
+    public function __construct($allowEmpty = false)
+    {
+        $this->allowEmpty = $allowEmpty;
+    }
+
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
         $success = true;
         if (is_null($value)) {
             $value = preg_replace('/(\d{4})-(\d{2})-(\d{2})/', '\3/\2/\1', @$page->values[$field]);
         } else {
+            $value = trim($value);
+            if (empty($value) && $this->allowEmpty) {
+                return null;
+            }
             $success = preg_match('@(\d{2})/(\d{2})/(\d{4})@', $value, $matches);
             if (!$success) {
                 Platal::page()->trigError("Les dates doivent être au format jj/mm/aaaa");
@@ -247,7 +262,7 @@ abstract class ProfilePage implements PlWizardPage
     {
     }
 
-    protected function saveData()
+    public function saveData()
     {
         require_once 'notifs.inc.php';
         $changedFields = array();
@@ -289,11 +304,13 @@ abstract class ProfilePage implements PlWizardPage
         $user = S::user();
         if ($owner->isActive() && $owner->id() != $user->id()) {
             foreach ($changedFields as $field => $values) {
-                XDB::execute('REPLACE INTO  profile_modifications (pid, uid, field, oldText, newText)
-                                    VALUES  ({?}, {?}, {?}, {?}, {?})',
+                XDB::execute('INSERT INTO  profile_modifications (pid, uid, field, oldText, newText)
+                                   VALUES  ({?}, {?}, {?}, {?}, {?})
+                  ON DUPLICATE KEY UPDATE  oldText = VALUES(oldText), newText = VALUES(newText)',
                              $this->pid(), $user->id(), $field, $values[0], $values[1]);
             }
         }
+        return true;
     }
 
     protected function checkChanges()
@@ -369,19 +386,41 @@ abstract class ProfilePage implements PlWizardPage
         }
         if ($global_success) {
             if ($this->checkChanges()) {
-                $this->saveData();
+                /* Save changes atomically to avoid inconsistent state
+                 * in case of error.
+                 */
+                if (!XDB::runTransaction(array($this, 'saveData'))) {
+                    $global_success = false;
+                    return PlWizard::CURRENT_PAGE;
+                }
                 $this->markChange();
             }
+            // XXX: removes this code once all merge related issues have been fixed.
+            static $issues = array(0 => array('name', 'promo', 'phone', 'education'), 1 => array('address'), 2 => array('job'));
+            if (isset($issues[Post::i('valid_page')])) {
+                foreach ($issues[Post::i('valid_page')] as $issue) {
+                    XDB::execute("UPDATE  profile_merge_issues
+                                     SET  issues = REPLACE(issues, {?}, '')
+                                   WHERE  pid = {?}",
+                                 $issue, $this->pid());
+                }
+            }
             return Post::has('next_page') ? PlWizard::NEXT_PAGE : PlWizard::CURRENT_PAGE;
         }
-        Platal::page()->trigError("Certains champs n'ont pas pu être validés, merci de corriger les informations "
-                                . "de ton profil et de revalider ta demande.");
+        $text = "Certains champs n'ont pas pu être validés, merci de corriger les informations "
+              . (S::user()->isMe($this->owner) ? "de ton profil et de revalider ta demande."
+                                               : "du profil et de revalider ta demande.");
+        Platal::page()->trigError($text);
         return PlWizard::CURRENT_PAGE;
     }
 
     public function success()
     {
-        return 'Ton profil a bien été mis à jour.';
+        if (S::user()->isMe($this->owner)) {
+            return 'Ton profil a bien été mis à jour.';
+        } else {
+            return 'Le profil a bien été mis à jour.';
+        }
     }
 }