X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fpage.inc.php;h=77cd2b7e91c4589442ce66116274f700f54d2e28;hb=e5bcd851d41fb3d177bdf48c6d6be57eb6a57441;hp=ec0ed6234d6797503fe1ad9471ff66ab140a52f8;hpb=7bff4cb031e50e345d346d2a333b5ac7a9d434fd;p=platal.git diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php index ec0ed62..77cd2b7 100644 --- a/modules/profile/page.inc.php +++ b/modules/profile/page.inc.php @@ -1,6 +1,6 @@ trig('URL Incorrecte : une url doit commencer par http:// ou https:// ou ftp://' - . ' et ne pas contenir de caractères interdits'); + Platal::page()->trigError('URL Incorrecte : une url doit commencer par http:// ou https:// ou ftp://' + . ' et ne pas contenir de caractères interdits'); } return $value; } @@ -69,11 +68,25 @@ class ProfileEmail extends ProfileNoSave return isset($page->values[$field]) ? $page->values[$field] : S::v($field); } $value = trim($value); - require_once 'xorg.misc.inc.php'; $success = empty($value) || isvalid_email($value); if (!$success) { - global $page; - $page->trig('Adresse Email invalide'); + Platal::page()->trigError('Adresse Email invalide'); + } + return $value; + } +} + +class ProfileNumber 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); + } + $value = trim($value); + $success = empty($value) || is_numeric($value); + if (!$success) { + Platal::page()->trigError('Numéro invalide'); } return $value; } @@ -87,13 +100,98 @@ class ProfileTel extends ProfileNoSave if (is_null($value)) { return isset($page->values[$field]) ? $page->values[$field] : S::v($field); } - $success = !preg_match('/[<>{}@&#~\/:;?,!§*_`\[\]|%$^=]/', $value, $matches); + 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) { - global $page; - $page->trig('Le numéro de téléphone contient un caractère interdit : ' . pl_entities($matches[0][0])); + 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) + { + $success = true; + if (is_null($value) || !is_array($value)) { + $value = array(); + $res = XDB::iterator("SELECT t.display_tel AS tel, t.tel_type AS type, t.pub, t.comment + FROM profile_phones AS t + WHERE t.uid = {?} AND t.link_type = {?} + ORDER BY t.tel_id", + $page->pid(), $this->link_type); + $value = $res->fetchAllAssoc(); + } + foreach ($value as $key=>&$phone) { + if (@$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'] = ''; + } + } } 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']); + } + } + + 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); + } + + //Only saves phones without a delete operation + public function saveTels($pid, $field, $value) + { + foreach ($value as $telid=>&$phone) { + $this->saveTel($pid, $telid, $phone); + } + } } class ProfilePub extends ProfileNoSave @@ -121,7 +219,7 @@ class ProfileBool extends ProfileNoSave if (is_null($value)) { $value = @$page->values[$field]; } - return $value ? 1 : 0; + return $value ? "1" : ""; } } @@ -135,16 +233,14 @@ class ProfileDate extends ProfileNoSave } else { $success = preg_match('@(\d{2})/(\d{2})/(\d{4})@', $value, $matches); if (!$success) { - global $page; - $page->trig("Les dates doivent être au format jj/mm/aaaa"); + Platal::page()->trigError("Les dates doivent être au format jj/mm/aaaa"); } else { $day = (int)$matches[1]; $month = (int)$matches[2]; $year = (int)$matches[3]; $success = ($day > 0 && $day <= 31) && ($month > 0 && $month <= 12) && ($year > 1900 && $year <= 2020); if (!$success) { - global $page; - $page->trig("La date n'a pas une valeur valide"); + Platal::page()->trigError("La date n'a pas une valeur valide"); } } } @@ -172,7 +268,7 @@ abstract class ProfileGeoloc implements ProfileSetting } else if (@$address['parsevalid']) { $address = array_merge($address, cut_address(@$address['text'])); $address['checked'] = true; - $mailer = new PlMailer('geoloc/mail_geoloc.tpl'); + $mailer = new PlMailer('geoloc/geoloc.mail.tpl'); $mailer->assign('text', get_address_text($address)); $mailer->assign('geoloc', $geotxt); $mailer->send(); @@ -187,6 +283,8 @@ abstract class ProfileGeoloc implements ProfileSetting $address['checked'] = true; } } + $address['precise_lat'] = rtrim($address['precise_lat'], '.0'); + $address['precise_lon'] = rtrim($address['precise_lon'], '.0'); $address['text'] = get_address_text($address); } } @@ -199,13 +297,18 @@ abstract class ProfilePage implements PlWizardPage protected $settings = array(); // A set ProfileSetting objects protected $errors = array(); // A set of boolean with the value check errors protected $changed = array(); // A set of boolean indicating wether the value has been changed + protected $watched = array(); // A set of boolean indicating the fields that are watched public $orig = array(); public $values = array(); + public $profile = null; + public $owner = null; public function __construct(PlWizard &$wiz) { $this->wizard =& $wiz; + $this->profile = $this->wizard->getUserData('profile'); + $this->owner = $this->wizard->getUserData('owner'); } protected function _fetchData() @@ -238,19 +341,25 @@ abstract class ProfilePage implements PlWizardPage protected function saveData() { + require_once 'notifs.inc.php'; 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]) { + register_profile_update($profile->id(), $field); + } } $this->_saveData(); // Update the last modification date XDB::execute('REPLACE INTO user_changes - SET user_id = {?}', S::v('uid')); + SET user_id = {?}', $profile->id()); + if (!S::suid()) { + register_watch_op($profile->id(), WATCH_FICHE); + } global $platal; - $log =& $_SESSION['log']; - $log->log('profil', $platal->pl_self(1)); + S::logger()->log('profil', $platal->pl_self(2)); } protected function checkChanges() @@ -280,11 +389,21 @@ abstract class ProfilePage implements PlWizardPage return 'profile/base.tpl'; } - protected function _prepare(PlatalPage &$page, $id) + public function pid() + { + return $this->profile->id(); + } + + public function hrpid() + { + return $this->profile->hrpid(); + } + + protected function _prepare(PlPage &$page, $id) { } - public function prepare(PlatalPage &$page, $id) + public function prepare(PlPage &$page, $id) { if (count($this->values) == 0) { $this->fetchData(); @@ -293,6 +412,8 @@ abstract class ProfilePage implements PlWizardPage $page->assign($field, $value); } $this->_prepare($page, $id); + $page->assign('profile', $this->profile); + $page->assign('owner', $this->owner); $page->assign('profile_page', $this->pg_template); $page->assign('errors', $this->errors); } @@ -319,9 +440,8 @@ abstract class ProfilePage implements PlWizardPage } return Post::has('next_page') ? PlWizard::NEXT_PAGE : PlWizard::CURRENT_PAGE; } - global $page; - $page->trig("Certains champs n'ont pas pu être validés, merci de corriger les informations " - . "de ton profil et de revalider ta demande"); + 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"); return PlWizard::CURRENT_PAGE; } }