From aa7cb8835068676865ffa42628044b482d204119 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Mon, 26 Jul 2010 22:53:09 +0200
Subject: [PATCH] Only displays warning about brokens in Xnet when required.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 modules/lists/lists.inc.php    |  4 ++--
 templates/lists/members.tpl    | 11 +++++++++++
 templates/xnetgrp/annuaire.tpl |  5 ++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php
index 9f902c4..7daccf6 100644
--- a/modules/lists/lists.inc.php
+++ b/modules/lists/lists.inc.php
@@ -30,7 +30,7 @@ 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->directoryName();
@@ -42,7 +42,7 @@ function list_sort_owners(&$members, $tri_promo = true)
             if ($tri_promo) {
                 $promo = null;
             }
-            $membres[$key][$nom.$mem] = array('n' => $nom, 'l' => $mem, 'p' => $promo, 'x' => $uid);
+            $membres[$key][$nom.$mem] = array('n' => $nom, 'l' => $mem, 'p' => $promo, 'x' => $uid, 'b' => $user->lost);
         }
     }
 
diff --git a/templates/lists/members.tpl b/templates/lists/members.tpl
index 6dda3c5..483c368 100644
--- a/templates/lists/members.tpl
+++ b/templates/lists/members.tpl
@@ -139,6 +139,7 @@
 
   </tr>
 
+  {assign var=lostCount value=0}
   {foreach from=$members item=users key=promo}
   {foreach from=$users item=user name=all}
   <tr>
@@ -149,6 +150,7 @@
     </td>
     <td>
       {if $promo && $user.x}
+      {if $user.b}{assign var=lostCount value=$lostCount+1}{/if}
       {profile user=$user.x promo=false}
       {elseif $user.x}
       <a href="{$platal->ns}member/{$user.x}">{if $user.n|trim}{$x.n}{else}{$user.l}{/if}</a>
@@ -167,6 +169,15 @@
   {/foreach}
   {/foreach}
 </table>
+
+{if $lostCount > 0}
+<p class="smaller">
+  {icon name=error}&nbsp;Un camarade signalé par ce symbole n'a plus d'adresse de redirection et ne peut donc
+  plus être contacté via son adresse polytechnique.org. Si tu connais sa nouvelle adresse, tu peux nous la communiquer en
+  cliquant sur le symbole.
+</p>
+{/if}
+
 {/if}
 
 
diff --git a/templates/xnetgrp/annuaire.tpl b/templates/xnetgrp/annuaire.tpl
index 896b9bf..25b9551 100644
--- a/templates/xnetgrp/annuaire.tpl
+++ b/templates/xnetgrp/annuaire.tpl
@@ -102,9 +102,11 @@ Le groupe {$asso->nom} compte {$nb_tot} membres&nbsp;:
     <th>Actions</th>
     {/if}
   </tr>
+  {assign var=lostCount value=0}
   {foreach from=$users item=user}
   <tr>
     <td>
+      {if $user->lost}{assign var=lostCount value=$lostCount+1}{/if}
       {profile user=$user promo=false}
     </td>
     <td>
@@ -149,12 +151,13 @@ Le groupe {$asso->nom} compte {$nb_tot} membres&nbsp;:
 </p>
 {/if}
 
-{* TODO: only displays following paragraph when required, ie when there is at least one concerned user in the displayed page *}
+{if $lostCount > 0}
 <p class="smaller">
   {icon name=error}&nbsp;Un camarade signalé par ce symbole n'a plus d'adresse de redirection et ne peut donc
   plus être contacté via son adresse polytechnique.org. Si tu connais sa nouvelle adresse, tu peux nous la communiquer en
   cliquant sur le symbole.
 </p>
+{/if}
 
 {/if}
 
-- 
2.1.4