From a66bcbba9cf647d83b810793e2a832a8fe84b054 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Mon, 24 Oct 2011 10:47:39 +0200 Subject: [PATCH] Adapts addresses list to ax requirements. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- include/userset.inc.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/include/userset.inc.php b/include/userset.inc.php index bcbe20e..56244d2 100644 --- a/include/userset.inc.php +++ b/include/userset.inc.php @@ -428,13 +428,18 @@ class AddressesView implements PlView pl_cached_content_headers('text/x-csv', 'iso-8859-1', 1, 'adresses.csv'); $csv = fopen('php://output', 'w'); - fputcsv($csv, array('adresses'), ';'); + fputcsv($csv, array('PROMOTION', 'TITRE', 'NOM', 'SOCIETE', 'ADRESSE', 'EMAIL'), ';'); if (!empty($pids)) { - $res = XDB::query('SELECT pd.public_name, pa.postalText - FROM profile_addresses AS pa - INNER JOIN profile_display AS pd ON (pd.pid = pa.pid) - WHERE pa.type = \'home\' AND pa.pub IN (\'public\', \'ax\') AND FIND_IN_SET(\'mail\', pa.flags) AND pa.pid IN {?} - GROUP BY pa.pid', $pids); + $res = XDB::query("SELECT pd.promo, IF(p.sex = 'female', 'Mme', 'M'), pd.short_name, pje.name, + pa.postalText, p.email_directory + FROM profile_addresses AS pa + INNER JOIN profiles AS p ON (pa.pid = p.pid) + INNER JOIN profile_display AS pd ON (pd.pid = pa.pid) + LEFT JOIN profile_job AS pj ON (pj.pid = pa.pid) + LEFT JOIN profile_job_enum AS pje ON (pj.jobid = pje.id) + WHERE pa.type = 'home' AND pa.pub IN ('public', 'ax') AND FIND_IN_SET('mail', pa.flags) + AND pa.pid IN {?} + GROUP BY pa.pid", $pids); foreach ($res->fetchAllAssoc() as $item) { fputcsv($csv, array_map('utf8_decode', $item), ';'); } -- 2.1.4