Change sorting order on ML display to use sort_name.

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

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index c18809f..233fc94 100644 (file)
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2011 Polytechnique.org                              *
+ *  Copyright (C) 2003-2014 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,36 +21,75 @@
 
 // {{{ function list_sort_owners
 
-function list_sort_owners($members, $tri_promo = true)
+function list_sort_owners($emails, $tri_promo = true)
 {
     global $globals;
 
     // $membres' structure is the following: $sortKey => $key => $listMember
     $membres = array();
+    $seen = array();
+
+    $members = array();
+
+    $uf = new UserFilter(new UFC_Email($emails));
+    $it = $uf->iterUsers();
+    while ($u = $it->next()) {
+        $members[$u->uid] = array(
+            'user' => $u,
+            'profile' => null,
+            'email' => $u->forlifeEmail());
+        $seen[] = $u->forlifeEmail();
+    }
+
+    $pf = new ProfileFilter(new UFC_Email($emails));
+    $it = $pf->iterProfiles();
+    if ($it) {
+        while ($p = $it->next()) {
+            $members[$p->owner_id]['user']->setPrefetchedProfile($p);
+            $members[$p->owner_id]['profile'] = $p;
+        }
+    }
+
+    foreach ($emails as $email) {
+        if (!in_array($email, $seen)) {
+            $seen[] = $email;
+            $members[$email] = array('user' => null, 'profile' => null,
+                'email' => $email);
+        }
+    }
+
+    // $members is now an array of uid => {'user': User or null, 'email': $email}
+
+    // $sorted_members is an array of $sortKey1 => $sortKey2 => {User, email}
+    $sorted_members = array();
 
     foreach($members as $member) {
-        $user = User::getSilent($member);
-        if (!$user) {
-            $membres[0][$member] = array('name' => null, 'email' => $member, 'category' => null, 'uid' => null, 'lost' => null, 'hasProfile' => null);
+        if (is_null($member['user'])) {
+            $category = 'AAAAA';
+            $name = $member['email'];
         } else {
-            $hasProfile = $user->hasProfile();
-            $uid = $user->id();
-            $name = $user->directoryName();
-            $category = $user->category();
-            $key = $tri_promo ? ($category ? $category : 'AAAAA') : strtoupper($name{0});
-            if (!$category) {
-                $category = 'extérieurs';
-            }
-            $membres[$key][$name] = array('name' => $name, 'email' => $member, 'category' => $category,
-                                          'uid' => $uid, 'lost' => $user->lost, 'hasProfile' => $hasProfile);
+            $category = $member['user']->category();
+            $name = $member['user']->sortName();
+        }
+        if (empty($category)) {
+            $category = "AAAAA";
         }
+
+        $main_sort_key = $tri_promo ? $category : strtoupper($name{0});
+        $alt_sort_key = $name;
+
+        if (!array_key_exists($main_sort_key, $sorted_members)) {
+            $sorted_members[$main_sort_key] = array();
+        }
+
+        $sorted_members[$main_sort_key][$alt_sort_key] = $member;
     }
 
-    ksort($membres);
-    foreach($membres as &$membre)  {
-        uksort($membre, 'strcasecmp');
+    uksort($sorted_members, 'strcasecmp');
+    foreach($sorted_members as &$subsorted_members)  {
+        uksort($subsorted_members, 'strcasecmp');
     }
-    return $membres;
+    return $sorted_members;
 }
 
 // }}}
@@ -84,9 +123,9 @@ function list_fetch_basic_info($members)
     foreach ($members as $member) {
         $user = User::getSilent($member);
         if (!$user) {
-            $res[] = $member . ',,';
+            $res[] = $member . ';;';
         } else {
-            $res[] = $user->forlifeEmail() . ',' . $user->directoryName() . ',' . $user->promo();
+            $res[] = $user->lastName() . ';' . $user->firstName() . ';' . $user->promo();
         }
     }
     return $res;
@@ -110,5 +149,5 @@ function list_header_decode($value) {
 }
 
 // }}}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>