Merge commit 'origin/fusionax' into account

[platal.git] / modules / lists / lists.inc.php

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index 2fcb84e..733bb38 100644 (file)
--- 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-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,46 +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);
-        if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) {
-            $res = XDB::query('SELECT  prenom, IF(nom_usage="", nom, nom_usage), promo,
-                                       (e.uid IS NULL AND FIND_IN_SET("googleapps", u.mail_storage) = 0)
-                                 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);
-            if(list($prenom, $nom, $promo, $broken) = $res->fetchOneRow()) {
-                $key = $tri_promo ? $promo : strtoupper($nom{0});
-                $membres[$key][$nom.$m] = Array('n' => "$prenom $nom", 'l' => $m, 'p' => (!$tri_promo ? $promo : null), 'b' => $broken);
-            } else {
-                $membres[0][] = Array('l' => $mem, 'b' => $broken);
-            }
+        $user = User::getSilent($mem);
+        if (!$user) {
+            $membres[0][] = array('l' => $mem, 'p' => (!$tri_promo ? 'inconnue' : null));
         } else {
-            $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,
-                                      0
-                                 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, $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));
+            $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' => $nom, 'l' => $m, 'p' => $promo, 'x' => $uid, 'b' => $broken);
         }
     }
 
@@ -70,11 +53,41 @@ function list_sort_owners(&$members, $tri_promo = true) {
 }
 
 // }}}
+// {{{ list_extract_member
+
+function _list_extract_member($member)
+{
+    return $member[1];
+}
+
+function list_extract_members($members)
+{
+    return array_map('_list_extract_member', $members);
+}
+
+// }}}
 // {{{ function list_sort_members
 
-function list_sort_members(&$members, $tri_promo = true) {
-    $member_list = array_map(create_function('$arr', 'return $arr[1];'), $members);
-    return list_sort_owners($member_list, $tri_promo);
+function list_sort_members($members, $tri_promo = true)
+{
+    $m = list_extract_members($members);
+    return list_sort_owners($m, $tri_promo);
+}
+
+// }}}
+
+function list_fetch_names($members)
+{
+    $res = array();
+    foreach ($members as $member) {
+        $user = User::getSilent($member);
+        if (!$user) {
+            $res[] = $member;
+        } else {
+            $res[] = $user->fullName();
+        }
+    }
+    return $res;
 }
 
 // }}}