X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Flists%2Flists.inc.php;h=891ef944aef32eeb5c4ad5fbbd48f06f984be8b0;hb=889fbf00f1036ad79096283e9a8a9552476b8b23;hp=217745aa40195817cb760c8eff8ce1cb20bf6a08;hpb=853ff307303faf861396c4e22dbaa56114366751;p=platal.git

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index 217745a..891ef94 100644
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,33 +21,35 @@
 
 // {{{ function list_sort_owners
 
-function list_sort_owners(&$members, $tri_promo = true)
+function list_sort_owners($members, $tri_promo = true)
 {
     global $globals;
 
-    $membres = Array();
+    // $membres' structure is the following: $sortKey => $key => $listMember
+    $membres = array();
 
-    foreach($members as $mem) {
-        $user = User::getSilent($mem);
+    foreach($members as $member) {
+        $user = User::getSilent($member);
         if (!$user) {
-            $membres[0][] = array('l' => $mem, 'p' => (!$tri_promo ? 'inconnue' : null), 'n' => null, 'x' => null, 'b' => null);
+            $membres[0][$member] = array('name' => null, 'email' => $member, 'category' => null, 'uid' => null, 'lost' => null, 'hasProfile' => null);
         } else {
+            $hasProfile = $user->hasProfile();
             $uid = $user->id();
-            $nom = $user->directoryName();
-            $promo = $user->promo();
-            if (!$promo) {
-                $promo = 'non-X';
-            }
-            $key = $tri_promo ? ($promo != 'non-X' ? $promo : 0) : strtoupper(@$nom{0});
-            if ($tri_promo) {
-                $promo = null;
+            $name = $user->directoryName();
+            $category = $user->category();
+            $key = $tri_promo ? ($category ? $category : 'AAAAA') : strtoupper($name{0});
+            if (!$category) {
+                $category = 'extérieurs';
             }
-            $membres[$key][$nom.$mem] = array('n' => $nom, 'l' => $mem, 'p' => $promo, 'x' => $uid, 'b' => $user->lost);
+            $membres[$key][$name] = array('name' => $name, 'email' => $member, 'category' => $category,
+                                          'uid' => $uid, 'lost' => $user->lost, 'hasProfile' => $hasProfile);
         }
     }
 
     ksort($membres);
-    foreach($membres as $key=>$val) ksort($membres[$key]);
+    foreach($membres as &$membre)  {
+        uksort($membre, 'strcasecmp');
+    }
     return $membres;
 }
 
@@ -84,7 +86,7 @@ function list_fetch_basic_info($members)
         if (!$user) {
             $res[] = $member . ',,';
         } else {
-            $res[] = $user->forlifeEmail() . ',' . $user->directoryName() . ',' . $user->promo();
+            $res[] = $user->directoryName() . ',' . $user->promo();
         }
     }
     return $res;