Merge branch 'bugfix-0511-webmailurl' into bugfix-webmail-url

Author: Kristan Kenney

bin/v-list-mail-domain

@@ -34,7 +34,8 @@ json_list() {
         "SUSPENDED": "'$SUSPENDED'",
         "TIME": "'$TIME'",
         "DATE": "'$DATE'",
-        "WEBMAIL_ALIAS": "'$WEBMAIL_ALIAS.$domain'"'
+        "WEBMAIL_ALIAS": "'$WEBMAIL_ALIAS.$domain'"
+        }'
     echo '}'
 }
 

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'])) {