Merge commit 'origin/fusionax' into account

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

diff --git a/modules/profile/addresses.inc.php b/modules/profile/addresses.inc.php
index d073956..70f40f6 100644 (file)
--- a/modules/profile/addresses.inc.php
+++ b/modules/profile/addresses.inc.php
@@ -83,38 +83,18 @@ class ProfileAddress extends ProfileGeocoding
         return $value;
     }
 
-    private function saveTel($addrid, $telid, array &$tel)
-    {
-        XDB::execute("INSERT INTO  profile_phones (uid, link_type, link_id, tel_id, tel_type,
-                                                   search_tel, display_tel, pub)
-                           VALUES  ({?}, 'address', {?}, {?}, {?},
-                                    {?}, {?}, {?})",
-                     S::i('uid'), $addrid, $telid, $tel['type'],
-                     format_phone_number($tel['tel']), $tel['tel'], $tel['pub']);
-    }
-
-    private function saveAddress($addrid, array &$address)
+    private function saveAddress($pid, $adrid, array &$address)
     {
         require_once "geocoding.inc.php";
 
         $flags = new PlFlagSet();
-        if ($address['current']) {
-            $flags->addFlag('current');
-        }
-        if ($address['temporary']) {
-            $flags->addFlag('temporary');
-        }
-        if ($address['secondary']) {
-            $flags->addFlag('secondary');
-        }
-        if ($address['mail']) {
-            $flags->addFlag('mail');
-        }
-        if ($address['cedex'] =
+        $flags->addFlag('current', $address['current']);
+        $flags->addFlag('temporary', $address['temporary']);
+        $flags->addFlag('secondary', $address['secondary']);
+        $flags->addFlag('mail', $address['mail']);
+        $flags->addFlag('cedex', $address['cedex'] =
             (strpos(strtoupper(preg_replace(array("/[0-9,\"'#~:;_\- ]/", "/\r\n/"),
-                                            array("", "\n"), $address['text'])), 'CEDEX')) !== false) {
-            $flags->addFlag('cedex');
-        }
+                                            array("", "\n"), $address['text'])), 'CEDEX')) !== false);
         Geocoder::getAreaId($address, "administrativeArea");
         Geocoder::getAreaId($address, "subAdministrativeArea");
         Geocoder::getAreaId($address, "locality");
@@ -125,7 +105,7 @@ class ProfileAddress extends ProfileGeocoding
                                                       north, south, east, west)
                            VALUES  ({?}, 'home', {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?},
                                     {?}, {?}, FROM_UNIXTIME({?}), {?}, {?}, {?}, {?}, {?}, {?})",
-                     S::i('uid'), $addrid, $flags, $address['accuracy'],
+                     $pid, $addrid, $flags, $address['accuracy'],
                      $address['text'], $address['postalText'], $address['postalCode'], $address['localityId'],
                      $address['subAdministrativeAreaId'], $address['administrativeAreaId'],
                      $address['countryId'], $address['latitude'], $address['longitude'],
@@ -137,14 +117,14 @@ class ProfileAddress extends ProfileGeocoding
     {
         XDB::execute("DELETE FROM  profile_addresses
                             WHERE  pid = {?} AND type = 'home'",
-                     S::i('uid'));
+                     $page->pid());
         XDB::execute("DELETE FROM  profile_phones
                             WHERE  uid = {?} AND link_type = 'address'",
-                     S::i('uid'));
+                     $page->pid());
         foreach ($value as $addrid => &$address) {
-            $this->saveAddress($addrid, $address);
+            $this->saveAddress($page->pid(), $addrid, $address);
             $profiletel = new ProfilePhones('address', $addrid);
-            $profiletel->saveTels('tel', $address['tel']);
+            $profiletel->saveTels($page->pid(), 'tel', $address['tel']);
         }
     }
 }
@@ -174,7 +154,7 @@ class ProfileAddresses extends ProfilePage
                              FROM  profile_addresses
                             WHERE  pid = {?} AND type = 'home'
                          ORDER BY  id",
-                           S::i('uid'));
+                           $this->pid());
         if ($res->numRows() == 0) {
             $this->values['addresses'] = array();
         } else {
@@ -185,7 +165,7 @@ class ProfileAddresses extends ProfilePage
                                 FROM  profile_phones
                                WHERE  uid = {?} AND link_type = 'address'
                             ORDER BY  link_id",
-                             S::i('uid'));
+                             $this->pid());
         $i = 0;
         $adrNb = count($this->values['addresses']);
         while ($tel = $res->next()) {