From c9a1b3ffbba12ac2074338df86bb554410896f89 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Tue, 10 May 2011 17:06:31 +0200 Subject: [PATCH] Adapts paypal and manageur scripts to new address tables. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- include/webservices/manageurs.server.inc.php | 20 ++++++++++++++------ modules/payment/money/paypal.inc.php | 22 +++++++++++++++------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/include/webservices/manageurs.server.inc.php b/include/webservices/manageurs.server.inc.php index fa56a3c..0d1eb60 100644 --- a/include/webservices/manageurs.server.inc.php +++ b/include/webservices/manageurs.server.inc.php @@ -38,15 +38,23 @@ function get_annuaire_infos($method, $params) { $params[1]); $array = $res->next(); } else { - $res = XDB::iterRow("SELECT p.birthdate, pa.text, pa.postalCode - gl.name, pa.countryId, p.pid, pa.id - FROM profiles AS p - LEFT JOIN profile_addresses AS pa ON (pa.pid = p.pid) - LEFT JOIN geoloc_localities AS gl ON (pl.id = pa.localityId) + $res = XDB::iterRow("SELECT p.birthdate, pa.text, pace3.short_name, pace2.short_name, pace1.short_name, p.pid, pa.id + FROM profiles AS p + LEFT JOIN profile_addresses AS pa ON (pa.pid = p.pid) + LEFT JOIN profile_addresses_components_enum AS pace1 ON (FIND_IN_SET('country', pace1.types)) + LEFT JOIN profile_addresses_components_enum AS pace2 ON (FIND_IN_SET('locality', pace2.types)) + LEFT JOIN profile_addresses_components_enum AS pace3 ON (FIND_IN_SET('postal_code', pace3.types)) + LEFT JOIN profile_addresses_components AS pac1 ON (pa.pid = pac1.pid AND pa.jobid = pac1.jobid AND pa.groupid = pac1.groupid + AND pa.id = pac1.id AND pa.type = pac1.type AND pace1.id = pac1.component_id) + LEFT JOIN profile_addresses_components AS pac2 ON (pa.pid = pac2.pid AND pa.jobid = pac2.jobid AND pa.groupid = pac2.groupid + AND pa.id = pac2.id AND pa.type = pac2.type AND pace2.id = pac2.component_id) + LEFT JOIN profile_addresses_components AS pac3 ON (pa.pid = pac3.pid AND pa.jobid = pac3.jobid AND pa.groupid = pac3.groupid + AND pa.id = pac3.id AND pa.type = pac3.type AND pace3.id = pac3.component_id) WHERE p.xorg_id = {?} AND NOT FIND_IN_SET('job', pa.flags) ORDER BY NOT FIND_IN_SET('current', pa.flags), FIND_IN_SET('secondary', pa.flags), - NOT FIND_IN_SET('mail', pa.flags)", + NOT FIND_IN_SET('mail', pa.flags) + GROUP BY pa.pid, pa.jobid, pa.groupid, pa.id, pa.type", $params[1]); // Process the addresses we got. if(list($age, $text, $adr['cp'], $adr['ville'], diff --git a/modules/payment/money/paypal.inc.php b/modules/payment/money/paypal.inc.php index ab1ed47..b58cea6 100644 --- a/modules/payment/money/paypal.inc.php +++ b/modules/payment/money/paypal.inc.php @@ -67,15 +67,23 @@ class PayPal ); if ($user->hasProfile()) { - $res = XDB::query("SELECT pa.text, gl.name AS city, pa.postalCode AS zip, pa.countryId AS country, + $res = XDB::query("SELECT pa.text, pace2.short_name AS city, pace3.short_name AS zip, pace1.short_name AS country, IF(pp1.display_tel != '', pp1.display_tel, pp2.display_tel) AS night_phone_b - FROM profile_addresses AS pa - LEFT JOIN profile_phones AS pp1 ON (pp1.pid = pa.pid AND pp1.link_type = 'address' - AND pp1.link_id = pa.id) - LEFT JOIN profile_phones AS pp2 ON (pp2.pid = pa.pid AND pp2.link_type = 'user' - AND pp2.link_id = 0) - LEFT JOIN geoloc_localities AS gl ON (gl.id = pa.localityId) + FROM profile_addresses AS pa + LEFT JOIN profile_phones AS pp1 ON (pp1.pid = pa.pid AND pp1.link_type = 'address' AND pp1.link_id = pa.id) + LEFT JOIN profile_phones AS pp2 ON (pp2.pid = pa.pid AND pp2.link_type = 'user' AND pp2.link_id = 0) + LEFT JOIN profile_addresses_components_enum AS pace1 ON (FIND_IN_SET('country', pace1.types)) + LEFT JOIN profile_addresses_components_enum AS pace2 ON (FIND_IN_SET('locality', pace2.types)) + LEFT JOIN profile_addresses_components_enum AS pace3 ON (FIND_IN_SET('postal_code', pace3.types)) + LEFT JOIN profile_addresses_components AS pac1 ON (pa.pid = pac1.pid AND pa.jobid = pac1.jobid AND pa.groupid = pac1.groupid + AND pa.id = pac1.id AND pa.type = pac1.type AND pace1.id = pac1.component_id) + LEFT JOIN profile_addresses_components AS pac2 ON (pa.pid = pac2.pid AND pa.jobid = pac2.jobid AND pa.groupid = pac2.groupid + AND pa.id = pac2.id AND pa.type = pac2.type AND pace2.id = pac2.component_id) + LEFT JOIN profile_addresses_components AS pac3 ON (pa.pid = pac3.pid AND pa.jobid = pac3.jobid AND pa.groupid = pac3.groupid + AND pa.id = pac3.id AND pa.type = pac3.type AND pace3.id = pac3.component_id) + WHERE pa.pid = {?} AND FIND_IN_SET('current', pa.flags) + GROUP BY pa.pid, pa.jobid, pa.groupid, pa.id, pa.type LIMIT 1", $user->profile()->id()); $this->infos['client'] = array_map('replace_accent', array_merge($info_client, $res->fetchOneAssoc())); -- 2.1.4