From d8ce27ebd41fdac9da7a0861f2cf26712fc879ef Mon Sep 17 00:00:00 2001
From: Thomas Minvielle <thomas.minvielle@polytechnique.org>
Date: Sun, 11 May 2014 00:03:02 +0200
Subject: [PATCH] Cannot choose @melix.org as bestalias.

---
 templates/emails/index.tpl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/emails/index.tpl b/templates/emails/index.tpl
index bb1e84e..6a7b7de 100644
--- a/templates/emails/index.tpl
+++ b/templates/emails/index.tpl
@@ -75,13 +75,15 @@
       <dt>Autres adresses (**)</dt>
       <dd>
         {foreach from=$aliases_other item=a}
+        {if strpos($a.email, '@melix.org') === false}
         <label>
           <input type='radio' {if $a.bestalias}checked="checked"{/if} name='best' value='{$a.email}' />
           <strong>{$a.email}</strong>
         </label>
         {if $a.expire}<span class='erreur'>(expire le {$a.expire|date_format})</span>{/if}
-        {if $a.alias}<a href="emails/alias">(changer ou supprimer mon alias melix)</a>{/if}
+        {if $a.alias} et <strong>@melix.org</strong> <a href="emails/alias">(changer ou supprimer mon alias melix)</a>{/if}
         <br />
+        {/if}
         {/foreach}
       </dd>
     {/if}
-- 
2.1.4