':new Date(i?1e3*i:0).toLocaleDateString(void 0,{year:"numeric",month:"2-digit",day:"2-digit",hour:"2-digit",minute:"2-digit",second:"2-digit"})}
@@ -293,6 +290,7 @@ jQuery(function($){
{"name":"rl","title":"RL","breakpoints":"xs sm md lg","style":{"min-width":"100px","width":"100px"}},
{"name":"backupmx","filterable": false,"style":{"min-width":"120px","width":"120px"},"title":lang.backup_mx,"breakpoints":"xs sm md lg","formatter": function(value){return 1==value?'':0==value&&'';}},
{"name":"domain_admins","title":lang.domain_admins,"style":{"word-break":"break-all","min-width":"200px"},"breakpoints":"xs sm md lg","filterable":(role == "admin"),"visible":(role == "admin")},
+ {"name":"tags","title":"Tags","style":{},"breakpoints":"xs sm md lg"},
{"name":"active","filterable": false,"style":{"min-width":"80px","width":"80px"},"title":lang.active,"formatter": function(value){return 1==value?'':0==value&&'';}},
{"name":"action","filterable": false,"sortable": false,"style":{"text-align":"right","min-width":"240px","width":"240px"},"type":"html","title":lang.action,"breakpoints":"xs sm md"}
],
@@ -330,6 +328,13 @@ jQuery(function($){
' DNS';
}
+ if (Array.isArray(item.tags)){
+ var tags = '';
+ for (var i = 0; i < item.tags.length; i++)
+ tags += ' ' + escapeHtml(item.tags[i]) + '';
+ item.tags = tags;
+ }
+
if (item.backupmx == 1) {
if (item.relay_unknown_only == 1) {
item.domain_name = 'Relay Non-Local
' + item.domain_name;
@@ -418,6 +423,7 @@ jQuery(function($){
},
{"name":"messages","filterable": false,"title":lang.msg_num,"breakpoints":"xs sm md"},
/* {"name":"rl","title":"RL","breakpoints":"all","style":{"width":"125px"}}, */
+ {"name":"tags","title":"Tags","style":{},"breakpoints":"xs sm md lg"},
{"name":"active","filterable": false,"style":{"min-width":"80px","width":"80px"},"title":lang.active,"formatter": function(value){return 1==value?'':(0==value?'':2==value&&'—');}},
{"name":"action","filterable": false,"sortable": false,"style":{"min-width":"290px","text-align":"right"},"type":"html","title":lang.action,"breakpoints":"xs sm md"}
],
@@ -497,6 +503,13 @@ jQuery(function($){
'' + item.percent_in_use + '%' + '
';
item.username = escapeHtml(item.username);
+
+ if (Array.isArray(item.tags)){
+ var tags = '';
+ for (var i = 0; i < item.tags.length; i++)
+ tags += ' ' + escapeHtml(item.tags[i]) + '';
+ item.tags = tags;
+ }
});
}
}),
diff --git a/data/web/json_api.php b/data/web/json_api.php
index c82aba6c..8f0e1398 100644
--- a/data/web/json_api.php
+++ b/data/web/json_api.php
@@ -14,17 +14,20 @@ function api_log($_data) {
if ($data == 'csrf_token') {
continue;
}
- if ($value = json_decode($value, true)) {
- unset($value["csrf_token"]);
+
+ $value = json_decode($value, true);
+ if ($value) {
+ if (is_array($value)) unset($value["csrf_token"]);
foreach ($value as $key => &$val) {
if(preg_match("/pass/i", $key)) {
$val = '*';
}
}
- $value = json_encode($value);
+ $value = json_encode($value);
}
$data_var[] = $data . "='" . $value . "'";
}
+
try {
$log_line = array(
'time' => time(),
@@ -41,7 +44,7 @@ function api_log($_data) {
'msg' => 'Redis: '.$e
);
return false;
- }
+ }
}
if (isset($_GET['query'])) {
@@ -82,10 +85,10 @@ if (isset($_GET['query'])) {
if ($action == 'delete') {
$_POST['items'] = $request;
}
-
}
api_log($_POST);
+
$request_incomplete = json_encode(array(
'type' => 'error',
'msg' => 'Cannot find attributes in post data'
@@ -486,7 +489,12 @@ if (isset($_GET['query'])) {
case "domain":
switch ($object) {
case "all":
- $domains = mailbox('get', 'domains');
+ $tags = null;
+ if (isset($_GET['tags']) && $_GET['tags'] != '')
+ $tags = explode(',', $_GET['tags']);
+
+ $domains = mailbox('get', 'domains', null, $tags);
+
if (!empty($domains)) {
foreach ($domains as $domain) {
if ($details = mailbox('get', 'domain_details', $domain)) {
@@ -952,23 +960,20 @@ if (isset($_GET['query'])) {
switch ($object) {
case "all":
case "reduced":
- if (empty($extra)) {
- $domains = mailbox('get', 'domains');
- }
- else {
- $domains = explode(',', $extra);
- }
+ $tags = null;
+ if (isset($_GET['tags']) && $_GET['tags'] != '')
+ $tags = explode(',', $_GET['tags']);
+
+ if (empty($extra)) $domains = mailbox('get', 'domains');
+ else $domains = explode(',', $extra);
+
if (!empty($domains)) {
foreach ($domains as $domain) {
- $mailboxes = mailbox('get', 'mailboxes', $domain);
+ $mailboxes = mailbox('get', 'mailboxes', $domain, $tags);
if (!empty($mailboxes)) {
foreach ($mailboxes as $mailbox) {
- if ($details = mailbox('get', 'mailbox_details', $mailbox, $object)) {
- $data[] = $details;
- }
- else {
- continue;
- }
+ if ($details = mailbox('get', 'mailbox_details', $mailbox, $object)) $data[] = $details;
+ else continue;
}
}
}
@@ -980,7 +985,17 @@ if (isset($_GET['query'])) {
break;
default:
- $data = mailbox('get', 'mailbox_details', $object);
+ $tags = null;
+ if (isset($_GET['tags']) && $_GET['tags'] != '')
+ $tags = explode(',', $_GET['tags']);
+
+ $mailboxes = mailbox('get', 'mailboxes', $object, $tags);
+ if (!empty($mailboxes)) {
+ foreach ($mailboxes as $mailbox) {
+ if ($details = mailbox('get', 'mailbox_details', $mailbox)) $data[] = $details;
+ else continue;
+ }
+ }
process_get_return($data);
break;
}
@@ -1580,13 +1595,25 @@ if (isset($_GET['query'])) {
process_delete_return(dkim('delete', array('domains' => $items)));
break;
case "domain":
- process_delete_return(mailbox('delete', 'domain', array('domain' => $items)));
+ switch ($object){
+ case "tag":
+ process_delete_return(mailbox('delete', 'tags_domain', array('tags' => $items, 'domain' => $extra)));
+ break;
+ default:
+ process_delete_return(mailbox('delete', 'domain', array('domain' => $items)));
+ }
break;
case "alias-domain":
process_delete_return(mailbox('delete', 'alias_domain', array('alias_domain' => $items)));
break;
case "mailbox":
- process_delete_return(mailbox('delete', 'mailbox', array('username' => $items)));
+ switch ($object){
+ case "tag":
+ process_delete_return(mailbox('delete', 'tags_mailbox', array('tags' => $items, 'username' => $extra)));
+ break;
+ default:
+ process_delete_return(mailbox('delete', 'mailbox', array('username' => $items)));
+ }
break;
case "resource":
process_delete_return(mailbox('delete', 'resource', array('name' => $items)));
diff --git a/data/web/lang/lang.en.json b/data/web/lang/lang.en.json
index fbbc3d09..8445641f 100644
--- a/data/web/lang/lang.en.json
+++ b/data/web/lang/lang.en.json
@@ -99,6 +99,7 @@
"subscribeall": "Subscribe all folders",
"syncjob": "Add sync job",
"syncjob_hint": "Be aware that passwords need to be saved plain-text!",
+ "tags": "Tags",
"target_address": "Goto addresses",
"target_address_info": "Full email address/es (comma-separated).",
"target_domain": "Target domain",
diff --git a/data/web/templates/edit/domain.twig b/data/web/templates/edit/domain.twig
index 2ece7ff3..74703bfd 100644
--- a/data/web/templates/edit/domain.twig
+++ b/data/web/templates/edit/domain.twig
@@ -23,6 +23,22 @@
+
+
+
+