Retrieve webmail alias when listing mail domains

bin/v-list-mail-account

@@ -17,6 +17,7 @@ format=${4-shell}
 
 # Includes
 source $HESTIA/func/main.sh
+source $HESTIA/conf/hestia.conf
 
 # JSON list function
 json_list() {
@@ -30,7 +31,8 @@ json_list() {
         "U_DISK": "'$U_DISK'",
         "SUSPENDED": "'$SUSPENDED'",
         "TIME": "'$TIME'",
-        "DATE": "'$DATE'"
+        "DATE": "'$DATE'",
+        "WEBMAIL_ALIAS": "'$WEBMAIL_ALIAS.$domain'"
     }'
     echo '}'
 }
@@ -47,12 +49,13 @@ shell_list() {
     echo "SUSPENDED:      $SUSPENDED"
     echo "TIME:           $TIME"
     echo "DATE:           $DATE"
+    echo "WEBMAIL_ALIAS:  $WEBMAIL_ALIAS.$domain"
 }
 
 # PLAIN list function
 plain_list() {
     echo -ne "$account\t$ALIAS\t$FWD\t$FWD_ONLY\t$AUTOREPLY\t$QUOTA\t"
-    echo -e "$U_DISK\t$SUSPENDED\t$TIME\t$DATE"
+    echo -e "$U_DISK\t$SUSPENDED\t$TIME\t$DATE\t$WEBMAIL_ALIAS.$domain"
 }
 
 # CSV list function
@@ -60,7 +63,7 @@ csv_list() {
     echo -n  "ACCOUNT,ALIAS,FWD,FWD_ONLY,AUTOREPLY,QUOTA,U_DISK"
     echo "SUSPENDED,TIME,DATE"
     echo -n "$ACCOUNT,\"$ALIAS\",\"$FWD\",$FWD_ONLY,$AUTOREPLY,$QUOTA,"
-    echo "$U_DISK,$SUSPENDED,$TIME,$DATE"
+    echo "$U_DISK,$SUSPENDED,$TIME,$DATE\t$WEBMAIL_ALIAS.$domain"
 }
 
 

bin/v-list-mail-domain

@@ -16,6 +16,7 @@ format=${3-shell}
 
 # Includes
 source $HESTIA/func/main.sh
+source $HESTIA/conf/hestia.conf
 
 # JSON list function
 json_list() {
@@ -32,8 +33,8 @@ json_list() {
         "LETSENCRYPT": "'$LETSENCRYPT'",
         "SUSPENDED": "'$SUSPENDED'",
         "TIME": "'$TIME'",
-        "DATE": "'$DATE'"
-    }'
+        "DATE": "'$DATE'",
+        "WEBMAIL_ALIAS": "'$WEBMAIL_ALIAS.$domain'"'
     echo '}'
 }
 
@@ -51,12 +52,13 @@ shell_list() {
     echo "SUSPENDED:      $SUSPENDED"
     echo "TIME:           $TIME"
     echo "DATE:           $DATE"
+    echo "WEBMAIL_ALIAS:  $WEBMAIL_ALIAS.$domain"
 }
 
 # PLAIN list function
 plain_list() {
     echo -ne "$DOMAIN\t$ANTIVIRUS\t$ANTISPAM\t$DKIM\t$CATCHALL\t"
-    echo -e "$ACCOUNTS\t$U_DISK\t$SSL\t$LETSENCRYPT\t$SUSPENDED\t$TIME\t$DATE"
+    echo -e "$ACCOUNTS\t$U_DISK\t$SSL\t$LETSENCRYPT\t$SUSPENDED\t$TIME\t$DATE\t$WEBMAIL_ALIAS.$domain"
 }
 
 # CSV list function
@@ -64,7 +66,7 @@ csv_list() {
     echo -n "DOMAIN,ANTIVIRUS,ANTISPAM,DKIM,CATCHALL,ACCOUNTS,U_DISK,"
     echo "SSL,LETSENCRYPT,SUSPENDED,TIME,DATE"
     echo -n "$DOMAIN,$ANTIVIRUS,$ANTISPAM,$DKIM,$CATCHALL,$ACCOUNTS,$U_DISK"
-    echo "$SSL,$LETSENCRYPT,$SUSPENDED,$TIME,$DATE"
+    echo "$SSL,$LETSENCRYPT,$SUSPENDED,$TIME,$DATE,$WEBMAIL_ALIAS.$domain"
 }
 
 

web/add/mail/index.php

@@ -79,6 +79,9 @@ if (!empty($_POST['ok_acc'])) {
         exit();
     }
 
+    // Set webmail alias
+    $v_webmail_alias = $data[$v_domain]['WEBMAIL_ALIAS'];
+    
     // Check empty fields
     if (empty($_POST['v_domain'])) $errors[] = __('domain');
     if (empty($_POST['v_account'])) $errors[] = __('account');
@@ -167,13 +170,6 @@ if (!empty($_POST['ok_acc'])) {
         unset($output);
     }
 
-    // Get webmail url
-    if (empty($_SESSION['error_msg'])) {
-        list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-        $webmail = "http://".$hostname."/".$v_webmail_alias."/";
-        if (!empty($_SESSION['WEBMAIL_ALIAS'])) $webmail = $_SESSION['WEBMAIL_ALIAS'];
-    }
-
     // Email login credentials
     if ((!empty($v_send_email)) && (empty($_SESSION['error_msg']))) {
         $to = $v_send_email;

web/edit/mail/index.php

@@ -45,6 +45,8 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
     $v_date = $data[$v_domain]['DATE'];
     $v_time = $data[$v_domain]['TIME'];
     $v_suspended = $data[$v_domain]['SUSPENDED'];
+    $v_webmail_alias = $data[$v_domain]['WEBMAIL_ALIAS'];
+    
     if ( $v_suspended == 'yes' ) {
         $v_status =  'suspended';
     } else {

web/templates/admin/add_mail_acc.html

@@ -188,13 +188,9 @@
                             <td><?=__('SMTP auth method')?>:</td>
                             <td><div><?=__('Normal password')?></div></td>
                         </tr>
-                        <?
-                            list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-                            $webmail = "http://".$v_webmail_alias.".".$v_domain."/";
-                        ?>
                         <tr>
                             <td><?=__('Webmail URL')?>:</td>
-                            <td><div><a class="vst" href="<?=$webmail?>" target="_blank"><?=$webmail?> <i></i></a></div></td>
+                            <td><div><a class="vst" href="<?=$v_webmail_alias?>" target="_blank"><?=$v_webmail_alias?> <i></i></a></div></td>
                         </tr>
                     </table>
                 </div>

web/templates/admin/edit_mail_acc.html

@@ -199,13 +199,9 @@
                             <td><?=__('SMTP auth method')?>:</td>
                             <td><div><?=__('Normal password')?></div></td>
                         </tr>
-                        <?
-                            list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-                            $webmail = "http://".$v_webmail_alias.".$v_domain."/";
-                        ?>
                         <tr>
                             <td><?=__('Webmail URL')?>:</td>
-                            <td><div><a class="vst" href="<?=$webmail?>" target="_blank"><?=$webmail?> <i></i></a></div></td>
+                            <td><div><a class="vst" href="<?=$v_webmail_alias?>" target="_blank"><?=$v_webmail_alias?> <i></i></a></div></td>
                         </tr>
                     </table>
                 </div>