Refactor list_sort_members.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index a1aacc7..f167ab2 100644 (file)
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -21,36 +21,73 @@
 
 // {{{ 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();
+    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']->directoryName();
         }
+        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;
     }
 
-    uksort($membres, 'strcasecmp');
-    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;
 }
 
 // }}}

diff --git a/templates/lists/display_list.tpl b/templates/lists/display_list.tpl
index 5f65363..39bbdc9 100644 (file)
--- a/templates/lists/display_list.tpl
+++ b/templates/lists/display_list.tpl
@@ -21,8 +21,12 @@
 {**************************************************************************}
 
 {assign var=lostUsers value=false}
-{foreach from=$list item=users key=sort_key}
-{foreach from=$users item=user name=all}
+{foreach from=$list item=members key=sort_key}
+{foreach from=$members item=member name=all}
+  {assign var=user value=$member.user}
+  {assign var=profile value=$member.profile}
+  {assign var=email value=$member.email}
+
 <tr>
   <td class='titre' style="width: 20%">
     {if $smarty.foreach.all.first}
@@ -30,23 +34,23 @@
     {/if}
   </td>
   <td>
-    {if t($user.hasProfile)}
-      {if t($user.lost)}{assign var=lostUsers value=true}{/if}
-      {profile user=$user.uid promo=$promo}
-    {elseif t($user.uid)}
-      <a href="mailto:{$user.email}">{if t($user.name)}{$user.name}{else}{$user.email}{/if}{if t($promo)} (extérieur){/if}</a>
-    {else}
-      <a href="mailto:{$user.email}">{if t($user.name)}{$user.name}{else}{$user.email}{/if}</a>
+    {if t($profile)}
+      {if $user->lost}{assign var=lostUsers value=true}{/if}
+      {profile user=$user profile=$profile promo=$promo}
+    {elseif t($user)}
+      <a href="mailto:{$email}">{if $user->directoryName}{$user->directoryName}{else}{$email}{/if}{if not t($promo)} (extérieur){/if}</a>
+    {else}{* Email without account or email *}
+      <a href="mailto:{$email}">{$email}</a>
     {/if}
   </td>
   {if t($delete)}
   <td class="center">
-    {if t($user.uid)}
-    <a href="{$platal->ns}member/{$user.uid}">{icon name=user_edit title='Éditer'}</a>&nbsp;
+    {if t($member.user)}
+    <a href="{$platal->ns}member/{$member.user->uid}">{icon name=user_edit title='Éditer'}</a>&nbsp;
     {else}
     {icon name=null}&nbsp;
     {/if}
-    <a href='{$platal->pl_self(1)}?{$delete}={$user.email}&amp;token={xsrf_token}'>{icon name=cross title='Retirer'}</a>
+    <a href='{$platal->pl_self(1)}?{$delete}={$member.email}&amp;token={xsrf_token}'>{icon name=cross title='Retirer'}</a>
   </td>
   {/if}
 </tr>