Merge branch 'bugfix-webmail-url' into webui-refresh-winterfell

Author: Kristan Kenney

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,20 +49,21 @@ 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
 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,9 @@ json_list() {
         "LETSENCRYPT": "'$LETSENCRYPT'",
         "SUSPENDED": "'$SUSPENDED'",
         "TIME": "'$TIME'",
-        "DATE": "'$DATE'"
-    }'
+        "DATE": "'$DATE'",
+        "WEBMAIL_ALIAS": "'$WEBMAIL_ALIAS.$domain'"
+        }'
     echo '}'
 }
 
@@ -51,20 +53,21 @@ 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
 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"
 }
 
 

install/upgrade/0.10.0-190430.sh

@@ -6,7 +6,7 @@ HESTIA_BACKUP="/root/hst_upgrade/$(date +%d%m%Y%H%M)"
 hestiacp="$HESTIA/install/deb"
 
 # Add webmail alias variable to system configuration if non-existent
-webmail_alias_check=$(cat $HESTIA/conf/hestia.conf | grep WEBMAIL_ALIAS)
+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

web/add/mail/index.php

@@ -6,6 +6,24 @@
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
+// Get all user domains 
+exec (HESTIA_CMD."v-list-mail-domains ".escapeshellarg($user)." json", $output, $return_var);
+$user_domains = json_decode(implode('', $output), true);
+$user_domains = array_keys($user_domains);
+unset($output);
+
+$v_domain = $_GET['domain'];
+if(!empty($v_domain)){
+    if(!in_array($v_domain, $user_domains)) {
+        header("Location: /list/mail/");
+        exit;
+    }
+    // Set webmail alias
+    exec (HESTIA_CMD."v-list-mail-domain ".escapeshellarg($user)." ".escapeshellarg($v_domain)." json", $output, $return_var);
+    $data = json_decode(implode('', $output), true);
+    unset($output);
+    $v_webmail_alias = $data[$v_domain]['WEBMAIL_ALIAS'];
+}
 
 // Check POST request for mail domain
 if (!empty($_POST['ok'])) {

web/edit/mail/index.php

@@ -45,6 +45,8 @@
     $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 {
@@ -96,6 +98,7 @@
     $v_quota = $data[$v_account]['QUOTA'];
     $v_autoreply = $data[$v_account]['AUTOREPLY'];
     $v_suspended = $data[$v_account]['SUSPENDED'];
+    $v_webmail_alias = $data[$v_account]['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://webmail.".$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="http://<?=$v_webmail_alias?>" target="_blank">http://<?=$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://webmail.".$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="http://<?=$v_webmail_alias?>" target="_blank">http://<?=$v_webmail_alias?> <i></i></a></div></td>
                         </tr>
                     </table>
                 </div>

web/templates/user/list_user.html

@@ -36,6 +36,8 @@
                       <option value="rebuild db"><?=__('rebuild db')?></option>
                       <option value="rebuild cron"><?=__('rebuild cron')?></option>
                       <option value="update counters"><?=__('update counters')?></option>
+                      <option value="suspend"><?= __('suspend')?></option>
+                      <option value="unsuspend"><?=__('unsuspend')?></option>
                       <option value="delete"><?=__('delete')?></option>
                     </select>
                   </div>