$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)
Phone::savePhones($value, $page->pid(), Phone::LINK_PROFILE);
}
- public function getText($value) {
+ public function getText($value)
+ {
return Phone::formArrayToString($value);
}
}
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");
}
return $value;
}
-}
-abstract class ProfileSettingGeocoding implements ProfileSetting
-{
- protected function geocodeAddress(array &$address, &$success)
+ public static function toSQLDate($value)
{
- require_once 'geocoding.inc.php';
- $success = true;
- if (isset($address['changed']) && $address['changed'] == 1) {
- $gmapsGeocoder = new GMapsGeocoder();
- $address = $gmapsGeocoder->getGeocodedAddress($address);
- if (isset($address['geoloc'])) {
- $success = false;
- }
- } elseif (@$address['changed'] && !@$address['text']) {
- $address = empty_address();
- $address['pub'] = 'private';
- }
- if (isset($address['geoloc_choice']) && ($address['geoloc_choice'] == 0)) {
- $mailer = new PlMailer('geoloc/geoloc.mail.tpl');
- $mailer->assign('text', $address['text']);
- $mailer->assign('geoloc', $address['geoloc']);
- $mailer->send();
- $gmapsGeocoder = new GMapsGeocoder();
- $address = $gmapsGeocoder->stripGeocodingFromAddress($address);
- }
- }
-
- public function getText($value) {
- return $value;
+ return preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $value);
}
}
-
abstract class ProfilePage implements PlWizardPage
{
protected $wizard;
{
}
- protected function saveData()
+ public function saveData()
{
require_once 'notifs.inc.php';
$changedFields = array();
$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()
}
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.';
+ }
}
}