Retrieve and set webmail alias via UI

bin/v-list-sys-config

@@ -46,7 +46,7 @@ json_list() {
         "LANGUAGE": "'$LANGUAGE'",
         "BACKUP_GZIP": "'$BACKUP_GZIP'",
         "BACKUP": "'$BACKUP'",
-        "MAIL_URL": "'$MAIL_URL'",
+        "WEBMAIL_ALIAS": "'$WEBMAIL_ALIAS'",
         "DB_PMA_URL": "'$DB_PMA_URL'",
         "DB_PGA_URL": "'$DB_PGA_URL'",
         "SOFTACULOUS": "'$SOFTACULOUS'"
@@ -85,8 +85,8 @@ shell_list() {
             echo -n " + $ANTISPAM_SYSTEM"
         fi
         echo
-        if [ ! -z "$MAIL_URL" ]; then
-            echo "Web Mail:       hostname + $MAIL_URL"
+        if [ ! -z "$WEBMAIL_ALIAS" ]; then
+            echo "Web Mail:       hostname + $WEBMAIL_ALIAS"
         fi
     fi
     if [ ! -z "$DB_SYSTEM" ]; then
@@ -139,7 +139,7 @@ plain_list() {
     echo -ne "$DNS_SYSTEM\t$DNS_CLUSTER\t$STATS_SYSTEM\t$BACKUP_SYSTEM\t"
     echo -ne "$CRON_SYSTEM\t$DISK_QUOTA\t$FIREWALL_SYSTEM\t"
     echo -ne "$FIREWALL_EXTENSION\t$REPOSITORY\t$VERSION\t$LANGUAGE\t"
-    echo -e "$BACKUP_GZIP\t$BACKUP\t$MAIL_URL\t$DB_PMA_URL\t$DB_PGA_URL"
+    echo -e "$BACKUP_GZIP\t$BACKUP\t$WEBMAIL_ALIAS\t$DB_PMA_URL\t$DB_PGA_URL"
 }
 
 
@@ -152,7 +152,7 @@ csv_list() {
     echo -n "'DNS_SYSTEM','DNS_CLUSTER','STATS_SYSTEM','BACKUP_SYSTEM',"
     echo -n "'CRON_SYSTEM','DISK_QUOTA','FIREWALL_SYSTEM',"
     echo -n "'FIREWALL_EXTENSION','REPOSITORY',"
-    echo -n "'VERSION','LANGUAGE','BACKUP_GZIP','BACKUP','MAIL_URL',"
+    echo -n "'VERSION','LANGUAGE','BACKUP_GZIP','BACKUP','WEBMAIL_ALIAS',"
     echo -n "'DB_PMA_URL','DB_PGA_URL'"
     echo
     echo -n "'$WEB_SYSTEM','$WEB_RGROUPS','$WEB_PORT','$WEB_SSL',"
@@ -162,7 +162,7 @@ csv_list() {
     echo -n "'$DNS_SYSTEM','$DNS_CLUSTER','$STATS_SYSTEM','$BACKUP_SYSTEM',"
     echo -n "'$CRON_SYSTEM','$DISK_QUOTA','$FIREWALL_SYSTEM','$REPOSITORY',"
     echo -n "'$FIREWALL_EXTENSION','$VERSION','$LANGUAGE','$BACKUP_GZIP',"
-    echo -n "'$BACKUP','$MAIL_URL','$DB_PMA_URL','$DB_PGA_URL'"
+    echo -n "'$BACKUP','$WEBMAIL_ALIAS','$DB_PMA_URL','$DB_PGA_URL'"
     echo
 }
 

web/add/mail/index.php

@@ -171,7 +171,7 @@ if (!empty($_POST['ok_acc'])) {
     if (empty($_SESSION['error_msg'])) {
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
         $webmail = "http://".$http_host."/webmail/";
-        if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
+        if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
     }
 
     // Email login credentials

web/edit/server/index.php

@@ -195,8 +195,8 @@ if (!empty($_POST['save'])) {
 
     // Update webmail url
     if (empty($_SESSION['error_msg'])) {
-        if ($_POST['v_mail_url'] != $_SESSION['MAIL_URL']) {
-            exec (HESTIA_CMD."v-change-sys-config-value MAIL_URL ".escapeshellarg($_POST['v_mail_url']), $output, $return_var);
+        if ($_POST['v_webmail_alias'] != $_SESSION['WEBMAIL_ALIAS']) {
+            exec (HESTIA_CMD."v-change-sys-webmail ".escapeshellarg($_POST['v_webmail_alias']), $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
             $v_mail_adv = 'yes';

web/templates/admin/add_mail_acc.html

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

web/templates/admin/edit_mail_acc.html

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

web/templates/admin/edit_server.html

@@ -276,7 +276,7 @@
                                         </tr>
                                         <tr>
                                             <td>
-                                                <input type="text" size="20" class="vst-input" name="v_mail_url" value="<?php echo $_SESSION['MAIL_URL']; ?>">
+                                                <input type="text" size="20" class="vst-input" name="v_webmail_alias" value="<?php echo $_SESSION['WEBMAIL_ALIAS']; ?>">
                                                 <br><br>
                                             </td>
                                         </tr>

web/templates/admin/list_mail.html

@@ -15,7 +15,7 @@
                 <?
                   list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                   $webmail = "http://webmail.".$http_host."/";
-                  if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
+                  if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
                 ?>
               </td>
               <td class="l-sort-toolbar__search-box step-left">
@@ -80,7 +80,7 @@
       <?
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
         $webmail = "http://webmail.".$http_host."/";
-        if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
+        if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
 
         foreach ($data as $key => $value) {
           ++$i;

web/templates/admin/list_mail_acc.html

@@ -14,7 +14,7 @@
                 <?
                   list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                   $webmail = "http://webmail.".$http_host."/";
-                  if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
+                  if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
                 ?>
               </td>
               <td class="l-sort-toolbar__search-box step-left">

web/templates/user/list_mail.html

@@ -15,7 +15,7 @@
                 <?
                   list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                   $webmail = "http://".$http_host."/webmail/";
-                  if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
+                  if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
                 ?>
               </td>
               <td class="l-sort-toolbar__search-box step-left">
@@ -60,7 +60,7 @@
       <?
         list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
         $webmail = "http://".$http_host."/webmail/";
-        if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
+        if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
 
         foreach ($data as $key => $value) {
           ++$i;

web/templates/user/list_mail_acc.html

@@ -14,7 +14,7 @@
                 <?
                   list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                   $webmail = "http://".$http_host."/webmail/";
-                  if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
+                  if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
                 ?>
               </td>
               <td class="l-sort-toolbar__search-box step-left">