X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists%2Flists.inc.php;h=2b2af8a4bcc1912519afd95505bf728464c32eb2;hb=0783a5ed4d3409bcd7a7e1d908696159999810c8;hp=0b7f3c9f5982c628495694a079e2bdcce7c6c420;hpb=dc2073c35a769a0fe026897d2f597c99ef92e5d3;p=platal.git

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index 0b7f3c9..2b2af8a 100644
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -27,36 +27,21 @@ function list_sort_owners(&$members, $tri_promo = true) {
     $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
-                                           FROM  auth_user_md5 AS u
-                                     INNER JOIN  aliases AS a ON u.user_id = a.id
-                                          WHERE  a.alias = {?}', $m);
-            if(list($prenom, $nom, $promo) = $res->fetchOneRow()) {
-                $key = $tri_promo ? $promo : strtoupper($nom{0});
-                $membres[$key][$nom.$m] = Array('n' => "$prenom $nom", 'l' => $m, 'p' => (!$tri_promo ? $promo : null));
-            } else {
-                $membres[0][] = Array('l' => $mem);
-            }
+        list($m, $dom) = explode('@', $mem);
+        $info = list_fetch_name($mem);
+        if (!isset($info['uid']) || is_null($info['uid'])) {
+            $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
-                                 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 = $info['uid'];
+            $nom = $info['nom'];
+            $prenom = $info['prenom'];
+            $promo = $info['promo'];
+            $broken = $info['lost'];
+            $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);
         }
     }
 
@@ -66,11 +51,68 @@ 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
+
+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);
+    }
+    return $res;
 }
 
 // }}}
@@ -78,14 +120,18 @@ function list_sort_members(&$members, $tri_promo = true) {
 
 function _list_header_decode($charset, $c, $str) {
     $s = ($c == 'Q' || $c == 'q') ? quoted_printable_decode($str) : base64_decode($str);
-    $s = iconv($charset, 'iso-8859-15', $s);
+    $s = iconv($charset, 'UTF-8', $s);
     return str_replace('_', ' ', $s);
 }
 
 function list_header_decode($value) {
+    if (!$value) {
+        return "[pas de sujet]";
+    }
     $val = preg_replace('/(=\?[^?]*\?[BQbq]\?[^?]*\?=) (=\?[^?]*\?[BQbq]\?[^?]*\?=)/', '\1\2', $value);
     return preg_replace('/=\?([^?]*)\?([BQbq])\?([^?]*)\?=/e', '_list_header_decode("\1", "\2", "\3")', $val);
 }
 
 // }}}
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>