From 8113d2b866ab469e4b8f208eb1ab35a8a065ccc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=EF=BF=BD=EF=BF=BD?=
 <anarcat@anarcat.ath.cx>
Date: Wed, 18 Jun 2014 18:55:00 +0000
Subject: [PATCH] disable help texts if empty, partly (missing IMAP/POP)

---
 bureau/admin/mail_list.php | 6 ++++++
 bureau/class/m_mail.php    | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bureau/admin/mail_list.php b/bureau/admin/mail_list.php
index 2572cb0b..d0dba089 100644
--- a/bureau/admin/mail_list.php
+++ b/bureau/admin/mail_list.php
@@ -202,6 +202,7 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
 
     <?php __("Which protocol shall you use?"); ?>
     <div id="accordion-mailout">
+      <?php if ($mail->srv_submission) { ?>
       <h4><?php __("Submission");?></h4>
       <div>
         <ul>
@@ -213,6 +214,8 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
         <li><b><?php __("Connection security:");?></b> STARTTLS</li>
         </ul>
       </div>
+      <?php } ?>
+      <?php if ($mail->srv_smtp) { ?>
       <h4><?php __("SMTP");?></h4>
       <div>
         <ul>
@@ -224,6 +227,8 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
           <li><b><?php __("Connection security:");?></b> STARTTLS</li>
         </ul>
       </div>
+      <?php } ?>
+      <?php if ($mail->srv_smtps) { ?>
       <h4><?php __("SMTPS");?></h4>
       <div>
         <ul>
@@ -235,6 +240,7 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
           <li><b><?php __("Connection security:");?></b> SSL</li>
         </ul>
       </div>
+      <?php } ?>
     </div><!-- accordion-mailout -->
 
 </div><!-- tabs-mailhelp-out -->
diff --git a/bureau/class/m_mail.php b/bureau/class/m_mail.php
index dbe77023..fe3d9197 100644
--- a/bureau/class/m_mail.php
+++ b/bureau/class/m_mail.php
@@ -82,9 +82,9 @@ class m_mail {
    * Constructeur
    */
   function m_mail() {
-    $this->srv_submission = variable_get('mail_human_submission', '%%FQDN%%','Human name for mail server (submission protocol)', array('desc'=>'Name','type'=>'string'));
-    $this->srv_smtp       = variable_get('mail_human_smtp',       '%%FQDN%%','Human name for mail server (SMTP protocol)', array('desc'=>'Name','type'=>'string'));
-    $this->srv_smtps      = variable_get('mail_human_smtps',      '%%FQDN%%','Human name for mail server (SMTPS protocol)', array('desc'=>'Name','type'=>'string'));
+    $this->srv_submission = variable_get('mail_human_submission', '%%FQDN%%','Human name for mail server (submission protocol), leave empty to disable help', array('desc'=>'Name','type'=>'string'));
+    $this->srv_smtp       = variable_get('mail_human_smtp',       '%%FQDN%%','Human name for mail server (SMTP protocol), leave empty to disable help', array('desc'=>'Name','type'=>'string'));
+    $this->srv_smtps      = variable_get('mail_human_smtps',      '%%FQDN%%','Human name for mail server (SMTPS protocol), leave empty to disable help', array('desc'=>'Name','type'=>'string'));
     $this->srv_imap       = variable_get('mail_human_imap',       '%%FQDN%%','Human name for IMAP mail server', array('desc'=>'Name','type'=>'string'));
     $this->srv_imaps      = variable_get('mail_human_imaps',      '%%FQDN%%','Human name for IMAPS mail server', array('desc'=>'Name','type'=>'string'));
     $this->srv_pop3       = variable_get('mail_human_pop3',       '%%FQDN%%','Human name for POP3 mail server', array('desc'=>'Name','type'=>'string'));