X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists%2Flists.inc.php;h=0b7f3c9f5982c628495694a079e2bdcce7c6c420;hb=1d10d3fd659fa8eb7c663d6bb599bc8bbc0feeb3;hp=b8216c7660a5fb122e8b6281cf7e09e9e868c96b;hpb=8040946cd3e7577fa797b8b65718ab885ce68ec6;p=platal.git

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index b8216c7..0b7f3c9 100644
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -40,13 +40,20 @@ function list_sort_owners(&$members, $tri_promo = true) {
                 $membres[0][] = Array('l' => $mem);
             }
         } else {
-            $res = XDB::query('SELECT m2.uid, m1.prenom, m1.nom
+            $res = XDB::query('SELECT m2.uid,
+                                      IF(m2.origine="X", u.prenom, m1.prenom) AS prenom,
+                                      IF(m2.origine="X", u.nom, m1.nom) AS nom,
+                                      IF(m2.origine="X", u.promo, "non-X") AS promo
                                  FROM groupex.membres AS m1
                             LEFT JOIN groupex.membres AS m2 ON(m1.email=m2.email AND m2.asso_id={?})
+                            LEFT JOIN auth_user_md5   AS u  ON(m2.origine = "X" AND m2.uid = u.user_id)
                                 WHERE m1.email={?}', $globals->asso('id'), $mem);
-            if (list($uid, $prenom, $nom) = $res->fetchOneRow()) {
-                $key = $tri_promo ? 0 : strtoupper($nom{0});
-                $membres[$key][$nom.$m] = Array('n' => "$prenom $nom", 'l' => $mem, 'x' => $uid, 'p' => (!$tri_promo ? 'non-X' : null));
+            if (list($uid, $prenom, $nom, $promo) = $res->fetchOneRow()) {
+                $key = $tri_promo ? ($promo != 'non-X' ? $promo : 0) : strtoupper($nom{0});
+                if ($tri_promo) {
+                    $promo = null;
+                }
+                $membres[$key][$nom.$m] = Array('n' => "$prenom $nom", 'l' => $mem, 'x' => $uid, 'p' => $promo);
             } else {
                 $membres[0][] = Array('l' => $mem, 'p' => (!$tri_promo ? 'non-X' : null));
             }