X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fpage.inc.php;h=433947e8b31e08ae9588b415fe925cebc9b7cfed;hb=f70f2bcdc077c220e40ecebaf569e097f6028743;hp=e30023d186c1094199cea686763081e53778527f;hpb=ddb649901f5a88d695a7050f2a59da140842ec89;p=platal.git diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php index e30023d..433947e 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,9 @@ 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; } @@ -89,8 +86,7 @@ class ProfileTel extends ProfileNoSave } $success = !preg_match('/[<>{}@&#~\/:;?,!§*_`\[\]|%$^=]/', $value, $matches); 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 numéro de téléphone contient un caractère interdit : ' . pl_entities($matches[0][0])); } return $value; } @@ -121,7 +117,32 @@ class ProfileBool extends ProfileNoSave if (is_null($value)) { $value = @$page->values[$field]; } - return $value ? 1 : 0; + return $value ? "1" : ""; + } +} + +class ProfileDate extends ProfileNoSave +{ + 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 { + $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 { + $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) { + Platal::page()->trigError("La date n'a pas une valeur valide"); + } + } + } + return $value; } } @@ -145,7 +166,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(); @@ -160,6 +181,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); } } @@ -172,6 +195,7 @@ 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(); @@ -181,12 +205,18 @@ abstract class ProfilePage implements PlWizardPage $this->wizard =& $wiz; } + protected function _fetchData() + { + } + protected function fetchData() { if (count($this->orig) > 0) { $this->values = $this->orig; return; } + + $this->_fetchData(); foreach ($this->settings as $field=>&$setting) { $success = false; if (!is_null($setting)) { @@ -199,20 +229,32 @@ abstract class ProfilePage implements PlWizardPage $this->orig = $this->values; } + protected function _saveData() + { + } + 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(S::i('uid'), $field); + } } + $this->_saveData(); // Update the last modification date XDB::execute('REPLACE INTO user_changes SET user_id = {?}', S::v('uid')); + if (!S::has('suid')) { + register_watch_op(S::i('uid'), WATCH_FICHE); + } global $platal; $log =& $_SESSION['log']; - $log->log('profil', $platal->pl_self(1)); + S::logger()->log('profil', $platal->pl_self(1)); } protected function checkChanges() @@ -242,7 +284,11 @@ abstract class ProfilePage implements PlWizardPage return 'profile/base.tpl'; } - public function prepare(PlatalPage &$page, $id) + protected function _prepare(PlPage &$page, $id) + { + } + + public function prepare(PlPage &$page, $id) { if (count($this->values) == 0) { $this->fetchData(); @@ -250,6 +296,7 @@ abstract class ProfilePage implements PlWizardPage foreach ($this->values as $field=>&$value) { $page->assign($field, $value); } + $this->_prepare($page, $id); $page->assign('profile_page', $this->pg_template); $page->assign('errors', $this->errors); } @@ -276,9 +323,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; } }