X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fpage.inc.php;h=64ba1915cebd07c43255fada3564684db86399f4;hb=5e4417a9f3f2dfa9ad9207de4022beeb14c797df;hp=96344b8d12ca37d5d1a831c18fb9ac83fddede1b;hpb=de0485fd001e8ed3f8649016d22332a9f01ad269;p=platal.git

diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php
index 96344b8..64ba191 100644
--- a/modules/profile/page.inc.php
+++ b/modules/profile/page.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -54,7 +54,7 @@ class ProfileWeb extends ProfileNoSave
         $success = empty($value) || preg_match("{^(https?|ftp)://[a-zA-Z0-9._%#+/?=&~-]+$}i", $value);
         if (!$success) {
             global $page;
-            $page->trig('URL Incorrecte : une url doit commencer par http:// ou https:// ou ftp://'
+            $page->trigError('URL Incorrecte : une url doit commencer par http:// ou https:// ou ftp://'
                       . ' et ne pas contenir de caractères interdits');
         }
         return $value;
@@ -73,7 +73,24 @@ class ProfileEmail extends ProfileNoSave
         $success = empty($value) || isvalid_email($value);
         if (!$success) {
             global $page;
-            $page->trig('Adresse Email invalide');
+            $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) {
+            global $page;
+            $page->trigError('Numéro invalide');
         }
         return $value;
     }
@@ -87,10 +104,17 @@ 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]));
+            $page->trigError('Le préfixe international du numéro de téléphone est inconnu. ');
         }
         return $value;
     }
@@ -136,7 +160,7 @@ class ProfileDate extends ProfileNoSave
             $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");
+                $page->trigError("Les dates doivent être au format jj/mm/aaaa");
            } else {
                 $day   = (int)$matches[1];
                 $month = (int)$matches[2];
@@ -144,7 +168,7 @@ class ProfileDate extends ProfileNoSave
                 $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");
+                    $page->trigError("La date n'a pas une valeur valide");
                 }
             }
         }
@@ -172,7 +196,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();
@@ -201,6 +225,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();
@@ -240,10 +265,14 @@ 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(S::i('uid'), $field);
+            }
         }
         $this->_saveData();
 
@@ -251,7 +280,6 @@ abstract class ProfilePage implements PlWizardPage
         XDB::execute('REPLACE INTO  user_changes
                                SET  user_id = {?}', S::v('uid'));
         if (!S::has('suid')) {
-            require_once 'notifs.inc.php';
             register_watch_op(S::i('uid'), WATCH_FICHE);
         }
         global $platal;
@@ -326,7 +354,7 @@ 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 "
+        $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;
     }