Merge remote branch 'origin/platal-1.0.0'

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

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index 38757c3..217745a 100644 (file)
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -30,20 +30,19 @@ function list_sort_owners(&$members, $tri_promo = true)
     foreach($members as $mem) {
         $user = User::getSilent($mem);
         if (!$user) {
-            $membres[0][] = array('l' => $mem, 'p' => (!$tri_promo ? 'inconnue' : null));
+            $membres[0][] = array('l' => $mem, 'p' => (!$tri_promo ? 'inconnue' : null), 'n' => null, 'x' => null, 'b' => null);
         } else {
             $uid = $user->id();
-            $nom = $user->fullName(); # XXX: Get a notion of 'last name' here, I want to sort user by lastnames
+            $nom = $user->directoryName();
             $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);
+            $membres[$key][$nom.$mem] = array('n' => $nom, 'l' => $mem, 'p' => $promo, 'x' => $uid, 'b' => $user->lost);
         }
     }
 
@@ -75,16 +74,17 @@ function list_sort_members($members, $tri_promo = true)
 }
 
 // }}}
+// {{{ function list_fetch_basic_info
 
-function list_fetch_names($members)
+function list_fetch_basic_info($members)
 {
     $res = array();
     foreach ($members as $member) {
         $user = User::getSilent($member);
         if (!$user) {
-            $res[] = $member;
+            $res[] = $member . ',,';
         } else {
-            $res[] = $user->fullName();
+            $res[] = $user->forlifeEmail() . ',' . $user->directoryName() . ',' . $user->promo();
         }
     }
     return $res;