7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mooay 2022 Update – The Tag Update | Revision B (2022-05b)

Browse Source 
This PR adds some API Fixes and one UI Fix (improvement)
This commit is contained in:
Niklas Meyer
2022-05-12 11:52:06 +02:00
committed by GitHub
parent 43d2a6e135 5839e22796
commit 9a812edee4
4 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/web/css/build/008-mailcow.css
View File

@@ -232,6 +232,9 @@ table.footable>tbody>tr.footable-empty>td {
font-style:italic; font-style:italic;
font-size: 1rem; font-size: 1rem;
} }
table>tbody>tr>td>span.footable-toggle {
opacity: 0.75;
}
.navbar-nav > li { .navbar-nav > li {
font-size: 1rem !important; font-size: 1rem !important;
} }
@@ -292,4 +295,5 @@ code {
padding: 0 5px 0 5px; padding: 0 5px 0 5px;
align-items: center; align-items: center;
display: inline-flex; display: inline-flex;
} }

9
data/web/inc/functions.mailbox.inc.php
View File

@@ -568,6 +568,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
)); ));
// save tags // save tags
foreach($tags as $index => $tag){ foreach($tags as $index => $tag){
if (empty($tag)) continue;
if ($index > $GLOBALS['TAGGING_LIMIT']) { if ($index > $GLOBALS['TAGGING_LIMIT']) {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'warning', 'type' => 'warning',
@@ -1124,6 +1125,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
)); ));
// save tags // save tags
foreach($tags as $index => $tag){ foreach($tags as $index => $tag){
if (empty($tag)) continue;
if ($index > $GLOBALS['TAGGING_LIMIT']) { if ($index > $GLOBALS['TAGGING_LIMIT']) {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'warning', 'type' => 'warning',
@@ -2201,8 +2203,9 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
':gal' => $gal, ':gal' => $gal,
':domain' => $domain ':domain' => $domain
)); ));
// save tags, tag_name is unique // save tags
foreach($tags as $index => $tag){ foreach($tags as $index => $tag){
if (empty($tag)) continue;
if ($index > $GLOBALS['TAGGING_LIMIT']) { if ($index > $GLOBALS['TAGGING_LIMIT']) {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'warning', 'type' => 'warning',
@@ -2368,8 +2371,9 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
':description' => $description, ':description' => $description,
':domain' => $domain ':domain' => $domain
)); ));
// save tags, tag_name is unique // save tags
foreach($tags as $index => $tag){ foreach($tags as $index => $tag){
if (empty($tag)) continue;
if ($index > $GLOBALS['TAGGING_LIMIT']) { if ($index > $GLOBALS['TAGGING_LIMIT']) {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'warning', 'type' => 'warning',
@@ -2712,6 +2716,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
)); ));
// save tags // save tags
foreach($tags as $index => $tag){ foreach($tags as $index => $tag){
if (empty($tag)) continue;
if ($index > $GLOBALS['TAGGING_LIMIT']) { if ($index > $GLOBALS['TAGGING_LIMIT']) {
$_SESSION['return'][] = array( $_SESSION['return'][] = array(
'type' => 'warning', 'type' => 'warning',

1
data/web/js/build/014-mailcow.js
View File

@@ -290,6 +290,7 @@ $(document).ready(function() {
var tagValuesElem = $(tagboxElem).find(".tag-values")[0]; var tagValuesElem = $(tagboxElem).find(".tag-values")[0];
var tag = escapeHtml($(tagInputElem).val()); var tag = escapeHtml($(tagInputElem).val());
if (!tag) return;
var value_tags = []; var value_tags = [];
try { try {
value_tags = JSON.parse($(tagValuesElem).val()); value_tags = JSON.parse($(tagValuesElem).val());

17
data/web/json_api.php
View File

@@ -989,14 +989,19 @@ if (isset($_GET['query'])) {
if (isset($_GET['tags']) && $_GET['tags'] != '') if (isset($_GET['tags']) && $_GET['tags'] != '')
$tags = explode(',', $_GET['tags']); $tags = explode(',', $_GET['tags']);
$mailboxes = mailbox('get', 'mailboxes', $object, $tags); if ($tags === null) {
if (!empty($mailboxes)) { $data = mailbox('get', 'mailbox_details', $object);
foreach ($mailboxes as $mailbox) { process_get_return($data);
if ($details = mailbox('get', 'mailbox_details', $mailbox)) $data[] = $details; } else {
else continue; $mailboxes = mailbox('get', 'mailboxes', $object, $tags);
if (is_array($mailboxes)) {
foreach ($mailboxes as $mailbox) {
if ($details = mailbox('get', 'mailbox_details', $mailbox))
$data[] = $details;
}
} }
process_get_return($data, false);
} }
process_get_return($data);
break; break;
} }
break; break;