X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists%2Flists.inc.php;h=38757c311fc8f48dfa937d63e848b94d4a5c3f24;hb=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;hp=2e60c61ef7423b0bd22ad707d47de2570550e519;hpb=49bbddef42c7f9f4b356784141e3985c111778b6;p=platal.git

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index 2e60c61..38757c3 100644
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,27 +21,29 @@
 
 // {{{ function list_sort_owners
 
-function list_sort_owners(&$members, $tri_promo = true) {
+function list_sort_owners(&$members, $tri_promo = true)
+{
     global $globals;
 
     $membres = Array();
 
     foreach($members as $mem) {
-        list($m, $dom) = explode('@', $mem);
-        $info = list_fetch_name($mem);
-        if (!isset($info['uid']) || is_null($info['uid'])) {
+        $user = User::getSilent($mem);
+        if (!$user) {
             $membres[0][] = array('l' => $mem, 'p' => (!$tri_promo ? 'inconnue' : null));
         } else {
-            $uid = $info['uid'];
-            $nom = $info['nom'];
-            $prenom = $info['prenom'];
-            $promo = $info['promo'];
-            $broken = $info['lost'];
+            $uid = $user->id();
+            $nom = $user->fullName(); # XXX: Get a notion of 'last name' here, I want to sort user by lastnames
+            $promo = $user->promo();
+            if (!$promo) {
+                $promo = 'non-X';
+            }
+            $broken = false; # XXX: fill it with the good value if the user has no valid email
             $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' => $m, 'p' => $promo, 'x' => $uid, 'b' => $broken);
+            $membres[$key][$nom.$m] = Array('n' => $nom, 'l' => $m, 'p' => $promo, 'x' => $uid, 'b' => $broken);
         }
     }
 
@@ -73,44 +75,17 @@ function list_sort_members($members, $tri_promo = true)
 }
 
 // }}}
-// {{{ function list_fetch_names
-
-function list_fetch_name($member)
-{
-    global $globals;
-    list($m, $dom) = explode('@', $member);
-    if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) {
-        $res = XDB::query('SELECT  u.user_id AS uid, prenom AS prenom, IF(nom_usage="", nom, nom_usage) AS nom,
-                                   promo AS promo,
-                                   (e.uid IS NULL AND FIND_IN_SET("googleapps", u.mail_storage) = 0) AS lost
-                             FROM  auth_user_md5 AS u
-                       INNER JOIN  aliases AS a ON u.user_id = a.id
-                        LEFT JOIN  emails AS e ON (e.flags = "active" AND e.uid = u.user_id)
-                            WHERE  a.alias = {?}
-                         GROUP BY  u.user_id', $m);
-    } else {
-        $res = XDB::query('SELECT m2.uid AS 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,
-                                  0 AS lost
-                             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'), $member);
-    }
-    if ($res->numRows() == 0) {
-        return array('email' => $member);
-    } else {
-        return array_merge(array('email' => $member), $res->fetchOneAssoc());
-    }
-}
 
 function list_fetch_names($members)
 {
     $res = array();
     foreach ($members as $member) {
-        $res[] = list_fetch_name($member);
+        $user = User::getSilent($member);
+        if (!$user) {
+            $res[] = $member;
+        } else {
+            $res[] = $user->fullName();
+        }
     }
     return $res;
 }