From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Mon, 11 Oct 2010 13:58:17 +0000 (+0200)
Subject: Don't show 'report spam' item in menu for user without email account.
X-Git-Tag: xorg/1.0.1~62
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4810af1eeced1975f74f2231cd119978561dd572;p=platal.git

Don't show 'report spam' item in menu for user without email account.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/templates/skin/common.menu.tpl b/templates/skin/common.menu.tpl
index 58004c8..b5f598d 100644
--- a/templates/skin/common.menu.tpl
+++ b/templates/skin/common.menu.tpl
@@ -45,13 +45,13 @@
 {/if}
 
 <div class="menu_title">Personnaliser</div>
-{if $smarty.session.user->checkPerms('mail')}
+{if hasPerm('mail')}
 <div class="menu_item"><a href="emails">Mes emails</a></div>
 {/if}
 {if $smarty.session.user->hasProfile()}
 <div class="menu_item"><a href="profile/edit">Mon profil</a></div>
 {/if}
-{if $smarty.session.user->checkPerms('directory_private')}
+{if hasPerm('directory_private')}
 <div class="menu_item"><a href="carnet/contacts">Mes contacts</a></div>
 <div class="menu_item"><a href="carnet">Mon carnet</a></div>
 {/if}
@@ -59,28 +59,30 @@
 <div class="menu_item"><a href="prefs">Mes préférences</a></div>
 
 <div class="menu_title">Services</div>
-{if $smarty.session.user->checkPerms('mail')}
+{if hasPerm('mail')}
 <div class="menu_item"><a href="emails/send">Envoyer un email</a></div>
 {/if}
-{if $smarty.session.user->checkPerms('forums')}
+{if hasPerm('forums')}
 <div class="menu_item"><a href="banana/">Forums &amp; PA</a></div>
 {/if}
 {if $smarty.session.user->googleapps}
 <div class="menu_item"><a href="http://gmail.polytechnique.org/">Emails Google Apps</a></div>
 {/if}
 <div class="menu_item"><a href="lists">Listes de diffusion</a></div>
-{if $smarty.session.user->checkPerms('payment')}
+{if hasPerm('payment')}
 <div class="menu_item"><a href="payment">Télépaiements</a></div>
 {/if}
+{if hasPerm('mail')}
 <div class="menu_item"><a href="emails/antispam/submit">Soumettre un spam</a></div>
+{/if}
 <div class="menu_item"><a href="emails/broken">Patte cassée</a></div>
 
 <div class="menu_title">Communauté X</div>
 <div class="menu_item"><a href="search">Annuaire</a></div>
-{if $smarty.session.user->checkPerms('directory_private')}
+{if hasPerm('directory_private')}
 <div class="menu_item"><a href="jobs">Emploi &amp; Carrières</a></div>
 {/if}
-{if $smarty.session.user->checkPerms('groups')}
+{if hasPerm('groups')}
 <div class="menu_item"><a href="groupes-x">Mes groupes X</a></div>
 {/if}
 <div class="menu_item"><a href="survey">Sondages</a></div>