Fixes last connexion on user admin page.

[platal.git] / include / userset.inc.php

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 56244d2..9d8d7df 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -428,17 +428,23 @@ 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('PROMOTION', 'TITRE', 'NOM', 'SOCIETE', 'ADRESSE', 'EMAIL'), ';');
+        fputcsv($csv,  array('PROMOTION', 'CIVILITE', 'NOM', 'PRENOM', 'SOCIETE', 'ADRESSE', 'CP', 'EMAIL'), ';');
         if (!empty($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 {?}
+            $res = XDB::query("SELECT  pd.promo, p.title,
+                                       IF (pn.firstname_ordinary = '', UPPER(pn.firstname_main), UPPER(pn.firstname_ordinary)) AS firstname,
+                                       IF (pn.lastname_ordinary = '', UPPER(pn.lastname_main), UPPER(pn.lastname_ordinary)) AS lastname,
+                                       UPPER(pje.name), pa.postalText, pa.postal_code_fr AS postal_code, p.email_directory
+                                 FROM  (SELECT  pid, postalText, jobid, groupid, type, id, postal_code_fr
+                                          FROM  profile_addresses
+                                         WHERE  pub IN ('public', 'ax') AND FIND_IN_SET('mail', flags) AND pid IN {?}
+                                      ORDER BY  pid, NOT FIND_IN_SET('current', flags),
+                                                FIND_IN_SET('secondary', flags), type = 'job') AS pa
+                           INNER JOIN  profiles                          AS p    ON (pa.pid = p.pid)
+                           INNER JOIN  profile_display                   AS pd   ON (pd.pid = pa.pid)
+                           INNER JOIN  profile_public_names              AS pn   ON (pn.pid = pa.pid)
+                            LEFT JOIN  profile_job                       AS pj   ON (pj.pid = pa.pid
+                                                                                     AND pj.id = IF(pa.type = 'job', pa.id, NULL))
+                            LEFT JOIN  profile_job_enum                  AS pje  ON (pj.jobid = pje.id)
                              GROUP BY  pa.pid", $pids);
             foreach ($res->fetchAllAssoc() as $item) {
                 fputcsv($csv, array_map('utf8_decode', $item), ';');