Merge branch 'develop' into webui-refresh-winterfell

Author: Kristan Kenney

web/add/mail/index.php

@@ -170,7 +170,7 @@
     // Get webmail url
     if (empty($_SESSION['error_msg'])) {
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-        $webmail = "http://".$http_host."/webmail/";
+        $webmail = "http://".$hostname."/".$v_webmail_alias."/";
         if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
     }
 
@@ -187,7 +187,6 @@
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
         $_SESSION['ok_msg'] = __('MAIL_ACCOUNT_CREATED_OK',htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST[v_domain]),htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST[v_domain]));
-        $_SESSION['ok_msg'] .= " / <a href=".$webmail." target='_blank'>" . __('open webmail') . "</a>";
         unset($v_account);
         unset($v_password);
         unset($v_password);

web/inc/i18n/en.php

@@ -315,7 +315,7 @@
     'Record Number' => 'Record Number',
     'in megabytes'  => 'in MB',
     'Message'  => 'Message',
-    'use local-part'  => 'Use local-part (without domain name)',
+    'use local-part'  => 'Use local-part without domain name',
     'one or more email addresses'  => 'One or more email addresses',
     'Prefix will be automaticaly added to database name and database user'  => 'Prefix <b>%s</b> will be added to the database and user names automatically',
     'Database'  => 'Database',

web/templates/admin/add_mail_acc.html

@@ -197,8 +197,7 @@
                         </tr>
                         <?
                             list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-                            $webmail = "http://".$http_host."/webmail/";
-                            if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
+                            $webmail = "http://webmail.".$v_domain."/";
                         ?>
                         <tr>
                             <td><?=__('Webmail URL')?>:</td>

web/templates/admin/edit_mail_acc.html

@@ -202,7 +202,6 @@
                         <?
                             list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                             $webmail = "http://webmail.".$v_domain."/";
-                            if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
                         ?>
                         <tr>
                             <td><?=__('Webmail URL')?>:</td>