From e77f1ef9e3a78d08d1d377b10c8824b4b99f11c9 Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Thu, 18 Oct 2012 09:22:52 +0000
Subject: [PATCH] =?UTF-8?q?On=20peux=20configurer=20le=20serveur=20mail=20?=
 =?UTF-8?q?indiqu=C3=A9=20a=20l'utilisateur=20dans=20les=20variables=20Alt?=
 =?UTF-8?q?ernC=20(permet=20de=20sp=C3=A9cifier=20un=20FQDN=20diff=C3=A9re?=
 =?UTF-8?q?nt=20pour=20les=20interrogation=20pop,imap,pop3...)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bureau/admin/mail_list.php | 14 +++++++-------
 bureau/class/m_mail.php    | 27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/bureau/admin/mail_list.php b/bureau/admin/mail_list.php
index 67ec5833..0eba53d1 100644
--- a/bureau/admin/mail_list.php
+++ b/bureau/admin/mail_list.php
@@ -170,7 +170,7 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
     <ul>
       <li><b><a href="javascript:;" onClick="$('#cfg-submission').toggle();"><?php __("Submission");?></a></b>
         <ul id='cfg-submission'>
-          <li><b><?php __("Server name: ");?></b> FIXME</li>
+          <li><b><?php __("Server name: ");?></b> <?php __($mail->srv_submission); ?></li>
           <li><b><?php __("Username: ");?></b> <?php __("The mail address you want to access <i>(example : myuser@example.tld)</i>");?></li>
           <li><b><?php __("Port: ");?></b> 587</li>
           <li><b><?php __("Authentication: ");?></b><?php __("Yes")?></li>
@@ -180,7 +180,7 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
       </li>
       <li><b><a href="javascript:;" onClick="$('#cfg-smtp').toggle();"><?php __("SMTP");?></a></b>
         <ul id='cfg-smtp'>
-          <li><b><?php __("Server name: ");?></b> FIXME</li>
+          <li><b><?php __("Server name: ");?></b> <?php __($mail->srv_smtp); ?></li>
           <li><b><?php __("Username: ");?></b> <?php __("The mail address you want to access <i>(example : myuser@example.tld)</i>");?></li>
           <li><b><?php __("Port: ");?></b> 25</li>
           <li><b><?php __("Authentication: ");?></b><?php __("FIXME")?></li>
@@ -190,7 +190,7 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
       </li>
        <li><b><a href="javascript:;" onClick="$('#cfg-smtps').toggle();"><?php __("SMTPS");?></a></b>
         <ul id='cfg-smtps'>
-          <li><b><?php __("Server name: ");?></b> FIXME</li>
+          <li><b><?php __("Server name: ");?></b> <?php __($mail->srv_smtps); ?></li>
           <li><b><?php __("Username: ");?></b> <?php __("The mail address you want to access <i>(example : myuser@example.tld)</i>");?></li>
           <li><b><?php __("Port: ");?></b> 465</li>
           <li><b><?php __("Authentication: ");?></b><?php __("FIXME")?></li>
@@ -204,7 +204,7 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
     <ul>
       <li><b><a href="javascript:;" onClick="$('#cfg-imap').toggle();"><?php __("IMAP");?></a></b>
         <ul id='cfg-imap'>
-          <li><b><?php __("Server name: ");?></b> FIXME</li>
+          <li><b><?php __("Server name: ");?></b> <?php __($mail->srv_imap); ?></li>
           <li><b><?php __("Port: ");?></b> 143</li>
           <li><b><?php __("Authentication: ");?></b><?php __("Yes")?></li>
           <li><b><?php __("Authentication method: ");?></b><?php __("Normal password")?></li>
@@ -214,7 +214,7 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
 
       <li><b><a href="javascript:;" onClick="$('#cfg-imaps').toggle();"><?php __("IMAPS");?></a></b>
         <ul id='cfg-imaps'>
-          <li><b><?php __("Server name: ");?></b> FIXME</li>
+          <li><b><?php __("Server name: ");?></b> <?php __($mail->srv_imaps); ?></li>
           <li><b><?php __("Port: ");?></b> 993</li>
           <li><b><?php __("Authentication: ");?></b><?php __("Yes")?></li>
           <li><b><?php __("Authentication method: ")?></b><?php __("Normal password")?></li>
@@ -224,7 +224,7 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
 
       <li><b><a href="javascript:;" onClick="$('#cfg-pop3').toggle();"><?php __("POP3");?></a></b>
         <ul id='cfg-pop3'>
-          <li><b><?php __("Server name: ");?></b> FIXME</li>
+          <li><b><?php __("Server name: ");?></b> <?php __($mail->srv_pop3); ?></li>
           <li><b><?php __("Port: ");?></b> 110</li>
           <li><b><?php __("Authentication: ");?></b><?php __("Yes")?></li>
           <li><b><?php __("Authentication method: ");?></b><?php __("Normal password")?></li>
@@ -234,7 +234,7 @@ if (date("Y-m-d")==substr($val["lastlogin"],0,10)) echo substr($val["lastlogin"]
 
       <li><b><a href="javascript:;" onClick="$('#cfg-pop3s').toggle();"><?php __("POP3S");?></a></b>
         <ul id='cfg-pop3s'>
-          <li><b><?php __("Server name: ");?></b> FIXME</li>
+          <li><b><?php __("Server name: ");?></b> <?php __($mail->srv_pop3s); ?></li>
           <li><b><?php __("Port: ");?></b> 995</li>
           <li><b><?php __("Authentication: ");?></b><?php __("Yes")?></li>
           <li><b><?php __("Authentication method: ");?></b><?php __("Normal password")?></li>
diff --git a/bureau/class/m_mail.php b/bureau/class/m_mail.php
index 5f77a3ca..2c0478b9 100644
--- a/bureau/class/m_mail.php
+++ b/bureau/class/m_mail.php
@@ -65,6 +65,33 @@ class m_mail {
    */
   var $total;
 
+  
+  // Human server name for help
+  var $srv_submission;
+  var $srv_smtp;
+  var $srv_smtps;
+  var $srv_imap;
+  var $srv_imaps;
+  var $srv_pop3;
+  var $srv_pop3s;
+
+  /* ----------------------------------------------------------------- */
+  /** 
+   * Constructeur
+   */
+  function m_mail() {
+    global $L_FQDN;
+    $this->srv_submission = variable_get('mail_human_submission', $L_FQDN,'Human name for mail server (submission protocol)');
+    $this->srv_smtp       = variable_get('mail_human_smtp',       $L_FQDN,'Human name for mail server (SMTP protocol)');
+    $this->srv_smtps      = variable_get('mail_human_smtps',      $L_FQDN,'Human name for mail server (SMTPS protocol)');
+    $this->srv_imap       = variable_get('mail_human_imap',       $L_FQDN,'Human name for IMAP mail server');
+    $this->srv_imaps      = variable_get('mail_human_imaps',      $L_FQDN,'Human name for IMAPS mail server');
+    $this->srv_pop3       = variable_get('mail_human_pop3',       $L_FQDN,'Human name for POP3 mail server');
+    $this->srv_pop3s      = variable_get('mail_human_pop3s',      $L_FQDN,'Human name for POP3s mail server');
+  }
+
+  
+
   /* ----------------------------------------------------------------- */
   /** get_quota (hook for quota class), returns the number of used 
    * service for a quota-bound service