git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "32243e56"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "e2b4b6f6"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: I51e2016ef5ab88a8b0bdc08551b18f48ceef0aa5
diff --git a/mailcow/src/mailcow-dockerized/data/web/json_api.php b/mailcow/src/mailcow-dockerized/data/web/json_api.php
index cdefb83..595bd8f 100644
--- a/mailcow/src/mailcow-dockerized/data/web/json_api.php
+++ b/mailcow/src/mailcow-dockerized/data/web/json_api.php
@@ -485,7 +485,7 @@
}
if (!empty($app_passwds)) {
foreach ($app_passwds as $app_passwd) {
- $details = app_passwd('details', array('id' => $app_passwd['id']));
+ $details = app_passwd('details', $app_passwd['id']);
if ($details !== false) {
$data[] = $details;
}
@@ -520,7 +520,7 @@
break;
}
break;
-
+
case "postcat":
switch ($object) {
default:
@@ -935,6 +935,33 @@
break;
}
break;
+ case "bcc-destination-options":
+ $domains = mailbox('get', 'domains');
+ $alias_domains = mailbox('get', 'alias_domains');
+ $data = array();
+ if (!empty($domains)) {
+ foreach ($domains as $domain) {
+ $data['domains'][] = $domain;
+ $mailboxes = mailbox('get', 'mailboxes', $domain);
+ foreach ($mailboxes as $mailbox) {
+ $data['mailboxes'][$mailbox][] = $mailbox;
+ $user_alias_details = user_get_alias_details($mailbox);
+ foreach ($user_alias_details['direct_aliases'] as $k => $v) {
+ $data['mailboxes'][$mailbox][] = $k;
+ }
+ foreach ($user_alias_details['shared_aliases'] as $k => $v) {
+ $data['mailboxes'][$mailbox][] = $k;
+ }
+ }
+ }
+ }
+ if (!empty($alias_domains)) {
+ foreach ($alias_domains as $alias_domain) {
+ $data['alias_domains'][] = $alias_domain;
+ }
+ }
+ process_get_return($data);
+ break;
case "syncjobs":
switch ($object) {
case "all":