X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fpage.inc.php;h=c6eae36768cea8288d9162f3844c4f429e54a4c5;hb=6cce7840e69bc0b6647e1bc5ea3437a925cd63a0;hp=78749ee17eda15f4b5fd44d948113e76ec7eb8ff;hpb=353f2d2b11c4e3c6c0bc3553813368b6f42fa9c6;p=platal.git diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php index 78749ee..c6eae36 100644 --- a/modules/profile/page.inc.php +++ b/modules/profile/page.inc.php @@ -1,6 +1,6 @@ values[$field]) ? $page->values[$field] : S::v($field); @@ -60,9 +68,9 @@ class ProfileWeb extends ProfileNoSave } } -class ProfileEmail extends ProfileNoSave +class ProfileSettingEmail extends ProfileNoSave { - public function value(ProfilePage &$page, $field, $value, &$success) + public function value(ProfilePage $page, $field, $value, &$success) { if (is_null($value)) { return isset($page->values[$field]) ? $page->values[$field] : S::v($field); @@ -76,9 +84,9 @@ class ProfileEmail extends ProfileNoSave } } -class ProfileNumber extends ProfileNoSave +class ProfileSettingNumber extends ProfileNoSave { - public function value(ProfilePage &$page, $field, $value, &$success) + public function value(ProfilePage $page, $field, $value, &$success) { if (is_null($value)) { return isset($page->values[$field]) ? $page->values[$field] : S::v($field); @@ -92,122 +100,48 @@ class ProfileNumber extends ProfileNoSave } } - -class ProfileTel extends ProfileNoSave +class ProfileSettingPhones implements ProfileSetting { - 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 ProfilePhones implements ProfileSetting -{ - private $tel; - private $pub; - protected $link_type; - protected $link_id; - - public function __construct($type, $link_id) - { - $this->tel = new ProfileTel(); - $this->pub = new ProfilePub(); - $this->link_type = $type; - $this->link_id = $link_id; - } - - public function value(ProfilePage &$page, $field, $value, &$success) + public function value(ProfilePage $page, $field, $value, &$success) { $success = true; + $phones = array(); + if (is_null($value)) { - $value = array(); - $res = XDB::iterator('SELECT display_tel AS tel, tel_type AS type, pub, comment - FROM profile_phones - WHERE uid = {?} 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' => '', - ) - ); + $it = Phone::iterate(array($page->pid()), array(Phone::LINK_PROFILE), array(0), Visibility::defaultForEdit()); + while ($phone = $it->next()) { + $success = ($phone->format() && $success); + $phones[] = $phone->toFormArray(); } - } - foreach ($value as $key=>&$phone) { - if (isset($phone['removed']) && $phone['removed']) { - unset($value[$key]); - } else { - unset($phone['removed']); - $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 (!$s) { - $phone['error'] = true; - $success = false; - } - if (!isset($phone['comment'])) { - $phone['comment'] = ''; - } + if (count($phones) == 0) { + $phone = new Phone(); + $phones[] = $phone->toFormArray(); } - } - return $value; - } - - private function saveTel($pid, $telid, array &$phone) - { - if ($phone['tel'] != '') { - XDB::execute("INSERT INTO profile_phones (uid, 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; + } else { + $phones = Phone::formatFormArray($value, $success); + if (!$success) { + Platal::page()->trigError('Numéro de téléphone invalide'); + } + return $phones; } } - public function save(ProfilePage &$page, $field, $value) + public function save(ProfilePage $page, $field, $value) { - XDB::execute("DELETE FROM profile_phones - WHERE uid = {?} 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, null, S::user()->isMe($page->owner) || S::admin()); + 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); - } + return Phone::formArrayToString($value); } } -class ProfilePub extends ProfileNoSave +class ProfileSettingPub extends ProfileNoSave { - public function value(ProfilePage &$page, $field, $value, &$success) + public function value(ProfilePage $page, $field, $value, &$success) { $success = true; if (is_null($value)) { @@ -220,11 +154,16 @@ class ProfilePub extends ProfileNoSave } return $value; } + + public function getText($value) { + static $pubs = array('public' => 'publique', 'ax' => 'annuaire AX', 'private' => 'privé'); + return $pubs[$value]; + } } -class ProfileBool extends ProfileNoSave +class ProfileSettingBool extends ProfileNoSave { - public function value(ProfilePage &$page, $field, $value, &$success) + public function value(ProfilePage $page, $field, $value, &$success) { $success = true; if (is_null($value)) { @@ -234,18 +173,29 @@ class ProfileBool extends ProfileNoSave } } -class ProfileDate extends ProfileNoSave +class ProfileSettingDate extends ProfileNoSave { - public function value(ProfilePage &$page, $field, $value, &$success) + 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"); - } else { + } else { $day = (int)$matches[1]; $month = (int)$matches[2]; $year = (int)$matches[3]; @@ -257,36 +207,13 @@ class ProfileDate extends ProfileNoSave } return $value; } -} -abstract class ProfileGeocoding 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); - } + return preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $value); } } - abstract class ProfilePage implements PlWizardPage { protected $wizard; @@ -301,7 +228,7 @@ abstract class ProfilePage implements PlWizardPage public $profile = null; public $owner = null; - public function __construct(PlWizard &$wiz) + public function __construct(PlWizard $wiz) { $this->wizard =& $wiz; $this->profile = $this->wizard->getUserData('profile'); @@ -336,15 +263,29 @@ abstract class ProfilePage implements PlWizardPage { } - protected function saveData() + public function saveData() { require_once 'notifs.inc.php'; + $changedFields = array(); foreach ($this->settings as $field=>&$setting) { - if (!is_null($setting) && $this->changed[$field]) { - $setting->save($this, $field, $this->values[$field]); - } - if ($this->changed[$field] && @$this->watched[$field]) { - WatchProfileUpdate::register($this->profile, $field); + if ($this->changed[$field]) { + if (!is_null($setting)) { + $changedFields[$field] = array( + preg_replace('/(\r\n|\n|\r)/', ' - ', $setting->getText($this->orig[$field])), + preg_replace('/(\r\n|\n|\r)/', ' - ', $setting->getText($this->values[$field])), + ); + } else { + $changedFields[$field] = array( + preg_replace('/(\r\n|\n|\r)/', ' - ', $this->orig[$field]), + preg_replace('/(\r\n|\n|\r)/', ' - ', $this->values[$field]), + ); + } + if (!is_null($setting)) { + $setting->save($this, $field, $this->values[$field]); + } + if (isset($this->watched[$field]) && $this->watched[$field]) { + WatchProfileUpdate::register($this->profile, $field); + } } } $this->_saveData(); @@ -355,6 +296,27 @@ abstract class ProfilePage implements PlWizardPage WHERE pid = {?}', $this->pid()); global $platal; S::logger()->log('profil', $platal->pl_self(2)); + + /** Stores all profile modifications for active users in order to: + * -daily notify the user in case of third party edition, + * -display the modification to the secretaries for verification in + * case of an edition made by the user. + */ + $owner = $this->profile->owner(); + $user = S::user(); + if ($owner->isActive()) { + foreach ($changedFields as $field => $values) { + if (in_array($field, Profile::$descriptions)) { + XDB::execute('INSERT INTO profile_modifications (pid, uid, field, oldText, newText, type, timestamp) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, NOW()) + ON DUPLICATE KEY UPDATE uid = VALUES(uid), oldText = IF(VALUES(type) != type, VALUES(oldText), oldText), + newText = VALUES(newText), type = VALUES(type), timestamp = NOW()', + $this->pid(), $user->id(), Profile::$descriptions[$field], $values[0], $values[1], + ($owner->id() == $user->id()) ? 'self' : 'third_party'); + } + } + } + return true; } protected function checkChanges() @@ -394,11 +356,11 @@ abstract class ProfilePage implements PlWizardPage return $this->profile->hrpid(); } - protected function _prepare(PlPage &$page, $id) + protected function _prepare(PlPage $page, $id) { } - public function prepare(PlPage &$page, $id) + public function prepare(PlPage $page, $id) { if (count($this->values) == 0) { $this->fetchData(); @@ -430,19 +392,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.'; + } } } @@ -453,6 +437,7 @@ require_once dirname(__FILE__) . '/decos.inc.php'; require_once dirname(__FILE__) . '/jobs.inc.php'; require_once dirname(__FILE__) . '/skills.inc.php'; require_once dirname(__FILE__) . '/mentor.inc.php'; +require_once dirname(__FILE__) . '/deltaten.inc.php'; // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>