X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fpage.inc.php;h=ec70a0ea2210ec3a1b237430033cbd91e12ea552;hb=00ba8a742be0cfc70eef7c6aaaccebe7134ec087;hp=8c17a05ea638eb6dddbd1a68c933992f2667dba0;hpb=1285cf5413df654ccac839b9d9a32c4df2cee95a;p=platal.git diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php index 8c17a05..ec70a0e 100644 --- a/modules/profile/page.inc.php +++ b/modules/profile/page.inc.php @@ -100,124 +100,42 @@ class ProfileSettingNumber extends ProfileNoSave } } - -class ProfileSettingTel extends ProfileNoSave -{ - public function value(ProfilePage &$page, $field, $value, &$success) - { - if (is_null($value)) { - return isset($page->values[$field]) ? $page->values[$field] : S::v($field); - } - require_once('profil.func.inc.php'); - $value = format_phone_number($value); - if($value == '') { - $success = true; - return $value; - } - $value = format_display_number($value,$error); - $success = !$error; - if (!$success) { - Platal::page()->trigError('Le préfixe international du numéro de téléphone est inconnu. '); - } - return $value; - } -} - class ProfileSettingPhones implements ProfileSetting { - private $tel; - private $pub; - protected $link_type; - protected $link_id; - - public function __construct($type, $link_id) - { - $this->tel = new ProfileSettingTel(); - $this->pub = new ProfileSettingPub(); - $this->link_type = $type; - $this->link_id = $link_id; - } - public function value(ProfilePage &$page, $field, $value, &$success) { $success = true; - if (is_null($value)) { - $value = array(); - $res = XDB::iterator('SELECT display_tel AS tel, tel_type AS type, pub, comment - FROM profile_phones - WHERE pid = {?} AND link_type = {?} - ORDER BY tel_id', - $page->pid(), $this->link_type); - if ($res->numRows() > 0) { - $value = $res->fetchAllAssoc(); - } else { - $value = array( - 0 => array( - 'type' => 'fixed', - 'tel' => '', - 'pub' => 'private', - 'comment' => '', - ) - ); - } - } + $phones = array(); - foreach ($value as $key=>&$phone) { - $phone['pub'] = $this->pub->value($page, 'pub', $phone['pub'], $s); - $phone['tel'] = $this->tel->value($page, 'tel', $phone['tel'], $s); - if(!isset($phone['type']) || ($phone['type'] != 'fixed' && $phone['type'] != 'mobile' && $phone['type'] != 'fax')) { - $phone['type'] = 'fixed'; - $s = false; + if (is_null($value)) { + $it = Phone::iterate(array($page->pid()), array(Phone::LINK_PROFILE), array(0)); + while ($phone = $it->next()) { + $success = ($phone->format() && $success); + $phones[] = $phone->toFormArray(); } - if (!$s) { - $phone['error'] = true; - $success = false; + if (count($phones) == 0) { + $phone = new Phone(); + $phones[] = $phone->toFormArray(); } - if (!isset($phone['comment'])) { - $phone['comment'] = ''; + return $phones; + } else { + $phones = Phone::formatFormArray($value, $success); + if (!$success) { + Platal::page()->trigError('Numéro de téléphone invalide'); } - } - - return $value; - } - - private function saveTel($pid, $telid, array &$phone) - { - if ($phone['tel'] != '') { - XDB::execute("INSERT INTO profile_phones (pid, link_type, link_id, tel_id, tel_type, - search_tel, display_tel, pub, comment) - VALUES ({?}, {?}, {?}, {?}, {?}, - {?}, {?}, {?}, {?})", - $pid, $this->link_type, $this->link_id, $telid, $phone['type'], - format_phone_number($phone['tel']), $phone['tel'], $phone['pub'], $phone['comment']); + return $phones; } } public function save(ProfilePage &$page, $field, $value) { - XDB::execute("DELETE FROM profile_phones - WHERE pid = {?} AND link_type = {?} AND link_id = {?}", - $page->pid(), $this->link_type, $this->link_id); - $this->saveTels($page->pid(), $field, $value); + Phone::deletePhones($page->pid(), Phone::LINK_PROFILE); + Phone::savePhones($value, $page->pid(), Phone::LINK_PROFILE); } - //Only saves phones without a delete operation - public function saveTels($pid, $field, $value) + public function getText($value) { - foreach ($value as $telid=>&$phone) { - $this->saveTel($pid, $telid, $phone); - } - } - - public function getText($value) { - $phones = array(); - foreach ($value as $phone) { - if ($phone['tel'] != '') { - $phones[] = 'type : ' . $phone['type'] .', numéro : ' . $phone['tel'] - . ', commentaire : « ' . $phone['comment'] . ' », affichage : ' . $phone['pub']; - } - } - return implode(' ; ' , $phones); + return Phone::formArrayToString($value); } } @@ -256,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"); @@ -277,40 +206,13 @@ class ProfileSettingDate extends ProfileNoSave } 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; @@ -360,7 +262,7 @@ abstract class ProfilePage implements PlWizardPage { } - protected function saveData() + public function saveData() { require_once 'notifs.inc.php'; $changedFields = array(); @@ -402,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() @@ -482,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.'; + } } }