瀏覽代碼

Merge pull request #3131 from gamalan/list-mailbox-alias-by-domain

List mailbox, alias/forwarder by domain using extra parameter
André Peters 5 年之前
父節點
當前提交
51d1fdcd3d
共有 1 個文件被更改,包括 12 次插入2 次删除
  1. 12 2
      data/web/json_api.php

+ 12 - 2
data/web/json_api.php

@@ -601,7 +601,12 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
           case "mailbox":
           case "mailbox":
             switch ($object) {
             switch ($object) {
               case "all":
               case "all":
-                $domains = mailbox('get', 'domains');
+                if (empty($extra)) {
+                  $domains = mailbox('get', 'domains');
+                }
+                else {
+                  $domains = array($extra);
+                }
                 if (!empty($domains)) {
                 if (!empty($domains)) {
                   foreach ($domains as $domain) {
                   foreach ($domains as $domain) {
                     $mailboxes = mailbox('get', 'mailboxes', $domain);
                     $mailboxes = mailbox('get', 'mailboxes', $domain);
@@ -940,7 +945,12 @@ if (isset($_SESSION['mailcow_cc_role']) || isset($_SESSION['pending_mailcow_cc_u
           case "alias":
           case "alias":
             switch ($object) {
             switch ($object) {
               case "all":
               case "all":
-                $domains = array_merge(mailbox('get', 'domains'), mailbox('get', 'alias_domains'));
+                if (empty($extra)) {
+                  $domains = array_merge(mailbox('get', 'domains'), mailbox('get', 'alias_domains'));
+                }
+                else {
+                  $domains = array($extra);
+                }
                 if (!empty($domains)) {
                 if (!empty($domains)) {
                   foreach ($domains as $domain) {
                   foreach ($domains as $domain) {
                     $aliases = mailbox('get', 'aliases', $domain);
                     $aliases = mailbox('get', 'aliases', $domain);