From fb31ee6bbdf5a73294b16b628f8aba721e741d94 Mon Sep 17 00:00:00 2001
From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Sun, 9 Mar 2008 17:28:58 +0100
Subject: [PATCH] Adds a flag to disable imap activation form to non-admins.
 Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>

---
 configs/platal.ini            | 18 ++++++++++--------
 templates/emails/redirect.tpl |  2 ++
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/configs/platal.ini b/configs/platal.ini
index fe98ecb..e5ac94f 100644
--- a/configs/platal.ini
+++ b/configs/platal.ini
@@ -25,14 +25,6 @@ event_reply = ""
 [Geoloc]
 webservice_url = ""
 
-[Mail]
-domain  = ""
-domain2 = ""
-
-alias_dom  = ""
-alias_dom2 = ""
-
-
 [Lists]
 rpchost   = "localhost"
 rpcport   = 4949
@@ -42,6 +34,16 @@ vhost_sep = "_"
 
 max_mail_per_min = 400
 
+[Mail]
+domain  = ""
+domain2 = ""
+
+alias_dom  = ""
+alias_dom2 = ""
+
+[MailStorage]
+imap_active = 0
+googleapps_active = 0
 
 [Manageurs]
 authorized_ips       = "129.104.30.32 129.104.30.33 213.251.145.200"
diff --git a/templates/emails/redirect.tpl b/templates/emails/redirect.tpl
index 30b7e61..5a5244e 100644
--- a/templates/emails/redirect.tpl
+++ b/templates/emails/redirect.tpl
@@ -208,6 +208,7 @@
 </fieldset>
 {/if}
 
+{if count($storage) neq 0 or #globals.mailstorage.imap_active# or hasPerm('admin')}
 <h1>Tes comptes de stockage de courrier</h1>
 <p>
   Polytechnique.org te propose de conserver les mails que tu reçois, pendant une durée limitée (environ 30 jours).
@@ -237,6 +238,7 @@
     </td>
   </tr>
 </table>
+{/if}
 
 {if $eleve}
 <h1>Pour les Élèves (non encore diplômés)</h1>
-- 
2.1.4