From d3a4f32c262cefe7741fb03e5201e3b49fba95d1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Fri, 1 Apr 2011 18:51:42 +0200
Subject: [PATCH] Fixes display of non-users in aliases.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 include/emails.inc.php              | 14 +++++++++++---
 templates/xnetlists/alias-admin.tpl | 26 ++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/include/emails.inc.php b/include/emails.inc.php
index 1e8a323..b83a5ea 100644
--- a/include/emails.inc.php
+++ b/include/emails.inc.php
@@ -67,12 +67,20 @@ function list_alias_members($local_part, $domain)
                                  WHERE  v.email = {?} AND d.name = {?} AND type = \'alias\'',
                                $local_part, $domain);
 
-    $members = array();
+    $users = array();
+    $nonusers = array();
     foreach ($emails as $email) {
-        $members[] = User::getSilent($email);
+        if ($user = User::getSilent($email)) {
+            $users[] = $user;
+        } else {
+            $nonusers[] = $email;
+        }
     }
 
-    return $members;
+    return array(
+        'users'    => $users,
+        'nonusers' => $nonusers
+    );
 }
 
 function delete_list_alias($local_part, $domain)
diff --git a/templates/xnetlists/alias-admin.tpl b/templates/xnetlists/alias-admin.tpl
index 3a8680a..f2c15b1 100644
--- a/templates/xnetlists/alias-admin.tpl
+++ b/templates/xnetlists/alias-admin.tpl
@@ -24,11 +24,15 @@
 
 <h1>Membres de {$platal->argv[1]}</h1>
 <table class='tinybicol'>
-  {if $members|@count}
-  {foreach from=$members item=member}
+  {if $members.users|@count}
+  {foreach from=$members.users item=member}
   <tr>
     <td>
-      <a href="https://www.polytechnique.org/profile/{$member->profile()->hrpid}" class="popup2">{$member->fullName()}</a>
+      {if $member->hasProfile()}
+      <a href="https://www.polytechnique.org/profile/{$member->hruid}" class="popup2">{$member->fullName()}</a>
+      {else}
+      {$member->fullName()}
+      {/if}
     </td>
     <td class="right">{$member->promo()}</td>
     <td class="center">
@@ -38,7 +42,21 @@
     </td>
   </tr>
   {/foreach}
-  {else}
+  {/if}
+  {if $members.nonusers|@count}
+  {foreach from=$members.nonusers item=member}
+  <tr>
+    <td>{$member}</td>
+    <td></td>
+    <td class="center">
+      <a href='{$platal->ns}alias/admin/{$platal->argv[1]}?del_member={$member}&amp;token={xsrf_token}'>
+      {icon name=delete title='retirer membre'}
+      </a>
+    </td>
+  </tr>
+  {/foreach}
+  {/if}
+  {if $members.users|@count eq 0 && $members.nonusers|@count eq 0}
   <tr>
     <td colspan="3">
       <em>aucun membre&hellip;</em>
-- 
2.1.4