Merge branch 'bugfix-webmail-alias' into develop

bin/v-change-sys-webmail

@@ -16,6 +16,12 @@ WEBMAIL=$1
 source $HESTIA/func/main.sh
 source $HESTIA/conf/hestia.conf
 
+# Get existing system webmail alias
+export $WEBMAIL_ALIAS
+
+# Define aliases
+OLD_ALIAS=$WEBMAIL_ALIAS
+NEW_ALIAS=$1
 
 #----------------------------------------------------------#
 #                    Verifications                         #
@@ -23,62 +29,41 @@ source $HESTIA/conf/hestia.conf
 
 check_args '1' "$#" 'WEBMAIL'
 
-# Check if string has leading /
-if [[ ! ${WEBMAIL:0:1} == "/" ]]; then
-    WEBMAIL="/$WEBMAIL"
-fi
-
 #----------------------------------------------------------#
 #                       Action                             #
 #----------------------------------------------------------#
 
-# Get existing apache2 webmail alias
-if [ -f /etc/apache2/conf.d/roundcube.conf ]; then
-    apache_webmail=$(tail -n+3 /etc/apache2/conf.d/roundcube.conf | grep "Alias" | { IFS=' '; read -r -a array; echo "${array[1]}"; })
-fi
-
-# Get existing nginx webmail alias
-if [ -f /etc/nginx/conf.d/webmail.inc ]; then
-    nginx_webmail=$(cat /etc/nginx/conf.d/webmail.inc | grep "location" | { IFS=' '; read -r -a array; echo "${array[1]}"; })
-fi
-
-# Check if alias is different for apache2
-if [ ! -z "$apache_webmail" ]; then
-    if [ ! "$apache_webmail" = "$WEBMAIL" ]; then
-        # Replace webmail alias in config files.
-        sed -i "s|Alias $apache_webmail|Alias $WEBMAIL|" /etc/apache2/conf.d/roundcube.conf
+# Delete old webmail configuration
+for user in `ls /usr/local/hestia/data/users/`; do
+    for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
+        $BIN/v-delete-webmail $user $domain
+    done
+done
 
-        # Replace in Backend UI
-        sed -i "s|$apache_webmail/|$WEBMAIL/|" /usr/local/hestia/web/templates/admin/list_mail.html
-        sed -i "s|$apache_webmail/|$WEBMAIL/|" /usr/local/hestia/web/templates/user/list_mail.html
+# Set new webmail alias
+sed -i "s|WEBMAIL_ALIAS='$OLD_ALIAS'|WEBMAIL_ALIAS='$NEW_ALIAS'|gI" $HESTIA/conf/hestia.conf
 
-        # Restart services
-        $HESTIA/bin/v-restart-service apache2
-    fi
-fi
-
-# Check if alias is different for nginx
-if [ ! -z "$nginx_webmail" ]; then
-    if [ ! "$nginx_webmail" = "$WEBMAIL" ]; then
-        # Replace webmail alias in config files.
-        sed -i "s|$nginx_webmail|$WEBMAIL|" /etc/nginx/conf.d/webmail.inc
-        sed -i "s|/var/lib$WEBMAIL|/var/lib/roundcube|" /etc/nginx/conf.d/webmail.inc
-
-        # Replace in Backend UI
-        sed -i "s|$nginx_webmail/|$WEBMAIL/|" /usr/local/hestia/web/templates/admin/list_mail.html
-        sed -i "s|$nginx_webmail/|$WEBMAIL/|" /usr/local/hestia/web/templates/user/list_mail.html
-
-        # Restart services
-        $HESTIA/bin/v-restart-service nginx
-    fi
-fi
+for user in `ls /usr/local/hestia/data/users/`; do
+    for domain in $($BIN/v-list-web-domains $user plain |cut -f 1); do
+        echo "Changing webmail alias for $domain"
+        $BIN/v-add-webmail $user $domain
+    done
+done
 
+# Update alias (non-subdomain) configuration to match
+sed -i "s|Alias \/webmail|Alias \/$NEW_ALIAS|gI" /etc/apache2/conf.d/roundcube.conf
+sed -i "s|location \/webmail|location \/$NEW_ALIAS|gI" /etc/nginx/conf.d/webmail.inc
 
 #----------------------------------------------------------#
 #                       Hestia                             #
 #----------------------------------------------------------#
 
+# Restart services
+$BIN/v-restart-web $restart
+$BIN/v-restart-proxy $restart
+
 # Logging
-#log_event "$OK" "$ARGUMENTS"
+log_history "changed system webmail alias to $NEW_ALIAS"
+log_event "$OK" "$ARGUMENTS"
 
 exit

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,9 @@ 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 "Webmail (subdomain):       $WEBMAIL_ALIAS.domain.tld"
+            echo "Webmail (alias):        hostname/$WEBMAIL_ALIAS"
         fi
     fi
     if [ ! -z "$DB_SYSTEM" ]; then
@@ -139,7 +140,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 +153,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 +163,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
 }
 

install/upgrade/0.10.0-190430.sh

@@ -5,9 +5,13 @@ HESTIA="/usr/local/hestia"
 HESTIA_BACKUP="/root/hst_upgrade/$(date +%d%m%Y%H%M)"
 hestiacp="$HESTIA/install/deb"
 
-# Add webmail alias variable to system configuration
-sed -i "/WEBMAIL_ALIAS/d" $HESTIA/conf/hestia.conf
-echo "WEBMAIL_ALIAS='webmail'" >> $HESTIA/conf/hestia.conf
+# Add webmail alias variable to system configuration if non-existent
+webmail_alias_check=$(cat $HESTIA/conf/hestia.conf | grep WEBMAIL_ALIAS)
+if [ -z "$WEBMAIL_ALIAS_CHECK" ]; then
+    echo "(*) Adding global webmail alias to system configuration..."
+    sed -i "/WEBMAIL_ALIAS/d" $HESTIA/conf/hestia.conf
+    echo "WEBMAIL_ALIAS='webmail'" >> $HESTIA/conf/hestia.conf
+fi
 
 # load hestia.conf
 source $HESTIA/conf/hestia.conf

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/inc/i18n/bs.php

@@ -559,7 +559,7 @@ $LANG['bs'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/cz.php

@@ -560,7 +560,7 @@ $LANG['cz'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/da.php

@@ -561,7 +561,7 @@ $LANG['da'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/de.php

@@ -559,7 +559,7 @@ $LANG['de'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/el.php

@@ -561,7 +561,7 @@ $LANG['el'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/en.php

@@ -561,7 +561,7 @@ $LANG['en'] = array(
     'MAIL Server' => 'Mail Server',
     'Antivirus' => 'Anti-Virus',
     'AntiSpam' => 'Spam Filter',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/es.php

@@ -567,7 +567,7 @@ $LANG['es'] = array(
     'MAIL Server' => 'Servidor de Correo',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'Soportar MYSQL',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'Soportar PostgreSQL',

web/inc/i18n/fr.php

@@ -559,7 +559,7 @@ $LANG['fr'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/hu.php

@@ -563,7 +563,7 @@ $LANG['hu'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/id.php

@@ -560,7 +560,7 @@ $LANG['id'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/it.php

@@ -560,7 +560,7 @@ $LANG['it'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/nl.php

@@ -563,7 +563,7 @@ $LANG['nl'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/no.php

@@ -560,7 +560,7 @@ $LANG['no'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/pl.php

@@ -560,7 +560,7 @@ $LANG['pl'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/pt-BR.php

@@ -559,7 +559,7 @@ $LANG['pt-BR'] = array(
     'MAIL Server' => 'Servidor de E-MAIL',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'Suporte MySQL',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'Suporte PostgreSQL',

web/inc/i18n/pt.php

@@ -559,7 +559,7 @@ $LANG['pt'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/ru.php

@@ -561,7 +561,7 @@ $LANG['ru'] = array(
     'MAIL Server' => 'MAIL Сервер',
     'Antivirus' => 'Антивирус',
     'AntiSpam' => 'АнтиСпам',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'Поддержка MySQL',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'Поддержка PostgreSQL',

web/inc/i18n/se.php

@@ -559,7 +559,7 @@ $LANG['se'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/sr.php

@@ -559,7 +559,7 @@ $LANG['sr'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL podrška',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL podrška',

web/inc/i18n/th.php

@@ -562,7 +562,7 @@ $LANG['th'] = array(
     'MAIL Server' => 'เซิร์ฟเวอร์เมล',
     'Antivirus' => 'ป้องกันไวรัส',
     'AntiSpam' => 'ป้องกันเมลขยะ',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'สนับสนุน MySQL',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'สนับสนุน PostgreSQL',

web/inc/i18n/tr.php

@@ -560,7 +560,7 @@ $LANG['tr'] = array(
     'MAIL Server' => 'MAIL Server',
     'Antivirus' => 'Antivirus',
     'AntiSpam' => 'AntiSpam',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'MySQL Support',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'PostgreSQL Support',

web/inc/i18n/ua.php

@@ -560,7 +560,7 @@ $LANG['ua'] = array(
     'MAIL Server' => 'MAIL сервер',
     'Antivirus' => 'Антивірус',
     'AntiSpam' => 'АнтиСпам',
-    'Webmail URL' => 'Webmail URL',
+    'Webmail URL' => 'Webmail Alias',
     'MySQL Support' => 'Підтримка MySQL',
     'phpMyAdmin URL' => 'phpMyAdmin URL',
     'PostgreSQL Support' => 'Підтримка PostgreSQL',

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">