Merge commit 'origin/master' into fusionax

[platal.git] / modules / profile / page.inc.php

diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php
index b380c3e..45fc082 100644 (file)
--- a/modules/profile/page.inc.php
+++ b/modules/profile/page.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -86,8 +86,7 @@ class ProfileNumber extends ProfileNoSave
         $value = trim($value);
         $success = empty($value) || is_numeric($value);
         if (!$success) {
-            global $page;
-            $page->trigError('Numéro invalide');
+            Platal::page()->trigError('Numéro invalide');
         }
         return $value;
     }
@@ -110,8 +109,7 @@ class ProfileTel extends ProfileNoSave
         $value = format_display_number($value,$error);
         $success = !$error;
         if (!$success) {
-            global $page;
-            $page->trigError('Le préfixe international du numéro de téléphone est inconnu. ');
+            Platal::page()->trigError('Le préfixe international du numéro de téléphone est inconnu. ');
         }
         return $value;
     }
@@ -121,30 +119,40 @@ class ProfilePhones implements ProfileSetting
 {
     private $tel;
     private $pub;
+    protected $id;
     protected $link_type;
     protected $link_id;
 
-    public function __construct($type, $id)
+    public function __construct($type, $link_id, $id = 0)
     {
+        if ($id != 0) {
+            $this->id = $id;
+        } else {
+            $this->id = S::i('uid');
+        }
         $this->tel = new ProfileTel();
         $this->pub = new ProfilePub();
         $this->link_type = $type;
-        $this->link_id = $id;
+        $this->link_id   = $link_id;
     }
 
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
         $success = true;
-        if (is_null($value)) {
-            $value = isset($page->values[$field]) ? $page->values[$field] : array();
-        }
-        if (!is_array($value)) {
+        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",
+                                 $this->id, $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')) {
@@ -170,8 +178,8 @@ class ProfilePhones implements ProfileSetting
                                        search_tel, display_tel, pub, comment)
                                VALUES  ({?}, {?}, {?}, {?}, {?},
                                        {?}, {?}, {?}, {?})",
-                         S::i('uid'), $this->link_type, $this->link_id, $telid, $phone['type'],
-                        format_phone_number($phone['tel']), $phone['tel'], $phone['pub'], $phone['comment']);
+                         $this->id, $this->link_type, $this->link_id, $telid, $phone['type'],
+                         format_phone_number($phone['tel']), $phone['tel'], $phone['pub'], $phone['comment']);
         }
     }
 
@@ -179,7 +187,7 @@ class ProfilePhones implements ProfileSetting
     {
         XDB::execute("DELETE FROM  profile_phones
                             WHERE  uid = {?} AND link_type = {?} AND link_id = {?}",
-                            S::i('uid'), $this->link_type, $this->link_id);
+                            $this->id, $this->link_type, $this->link_id);
         $this->saveTels($field, $value);
     }
 
@@ -353,7 +361,6 @@ abstract class ProfilePage implements PlWizardPage
             register_watch_op(S::i('uid'), WATCH_FICHE);
         }
         global $platal;
-        $log =& $_SESSION['log'];
         S::logger()->log('profil', $platal->pl_self(1));
     }