Merge branch 'platal-0.9.15'

[platal.git] / templates / include / minifiche.tpl

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index f1b8ddd..4fa451b 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -35,8 +35,8 @@
     {if $c.iso3166}
     <img src='images/flags/{$c.iso3166}.gif' alt='{$c.nat}' height='11' title='{$c.nat}' />&nbsp;
     {/if}
-    (X {$c.promo}{if $c.app0text}, {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url}
-    {/if}{if $c.app1text}, {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}{/if})
+    (X {$c.promo}{if $c.app0text}, {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url}{*
+    *}{/if}{if $c.app1text}, {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}{/if})
     {if $c.dcd}décédé{if $c.sexe}e{/if} le {$c.deces|date_format}{/if}
     {if $smarty.session.auth ge AUTH_COOKIE}
     {if !$c.dcd && !$c.wasinscrit}
@@ -73,7 +73,7 @@
     {/if}
     {/if}
 
-    {if $smarty.session.perms eq admin}
+    {if hasPerm('admin')}
       [{if !$c.wasinscrit && !$c.dcd}
         <a href="marketing/private/{$c.user_id}">{*
           *}{icon name=email title="marketter user"}</a>
@@ -126,8 +126,8 @@
       {if !$c.dcd && !$c.actif && $c.wasinscrit && $smarty.session.auth ge AUTH_COOKIE}
       <tr>
         <td class="smaller" colspan="2">
-          Ce camarade n'a plus d'adresse redirection valide.
-          <a href="marketing/broken/{$c.user_id}">
+          Ce camarade n'a plus d'adresse de redirection valide.
+          <a href="marketing/broken/{$c.forlife}">
             Si tu en connais une, <strong>n'hésite pas à nous la transmettre</strong>
           </a>
         </td>