From c5ae7881af1dfc07e6763887d4491b7a63d91874 Mon Sep 17 00:00:00 2001
From: dpeca <peca@mycity.rs>
Date: Thu, 21 Jul 2016 01:57:22 +0200
Subject: [PATCH] Fix for SMTP and IMAP hostname in add_mail_acc.html template

Dovecot and Exim4 is able to handle ONLY one TLS / SSL certs.
In most cases - it is a cert ONLY for server hostname.
So, if you point mail client to $v_domain for IMAP/SMTP TLS - mail client will popup a warning and it will say that certs are for server hostname - not for domain that client added.

So, in most cases (in 99% percents) it is better to point mail client to server hostname - because Exim4 and Dovecot have valid cert for server hostname.
---
 web/templates/admin/add_mail_acc.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index 70f2d5bc6..725780eee 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -132,6 +132,7 @@
             <td class="mail-infoblock-td">
                 <div class="mail-infoblock">
                 <table>
+                    <?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
                     <tr>
                         <td><?=__('Username')?>:</td>
                         <td><span id="v_account">william.cage</span>@<?=htmlentities($v_domain)?></td>
@@ -142,7 +143,7 @@
                     </tr>
                     <tr>
                         <td><?=__('IMAP hostname')?>:</td>
-                        <td><?=htmlentities($v_domain)?></td>
+                        <td><?=$hostname?></td>
                     </tr>
                     <tr>
                         <td><?=__('IMAP port')?>:</td>
@@ -158,7 +159,7 @@
                     </tr>
                     <tr>
                         <td><?=__('SMTP hostname')?></td>
-                        <td><?=htmlentities($v_domain)?></td>
+                        <td><?=$hostname?></td>
                     </tr>
                     <tr>
                         <td><?=__('SMTP port')?>:</td>
@@ -179,4 +180,4 @@
         </tr>
     </table>
     </form>
-  </div>
\ No newline at end of file
+  </div>