Compare commits
12 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
b68eae16e5 | ||
|
9a812edee4 | ||
|
43d2a6e135 | ||
|
5839e22796 | ||
|
df33ebb2a0 | ||
|
d2a6838958 | ||
|
96b8054e6b | ||
|
dfdd2dadb4 | ||
|
d0528b7883 | ||
|
f40e682800 | ||
|
f4dc01d1ec | ||
|
187ddedf96 |
7
.github/ISSUE_TEMPLATE/Bug_report.yml
vendored
7
.github/ISSUE_TEMPLATE/Bug_report.yml
vendored
@@ -54,10 +54,11 @@ body:
|
|||||||
| --- | --- |
|
| --- | --- |
|
||||||
| My operating system | I_DO_REPLY_HERE |
|
| My operating system | I_DO_REPLY_HERE |
|
||||||
| Is Apparmor, SELinux or similar active? | I_DO_REPLY_HERE |
|
| Is Apparmor, SELinux or similar active? | I_DO_REPLY_HERE |
|
||||||
| Virtualization technlogy (KVM, VMware, Xen, etc - **LXC and OpenVZ are not supported** | I_DO_REPLY_HERE |
|
| Virtualization technology (KVM, VMware, Xen, etc - **LXC and OpenVZ are not supported** | I_DO_REPLY_HERE |
|
||||||
| Server/VM specifications (Memory, CPU Cores) | I_DO_REPLY_HERE |
|
| Server/VM specifications (Memory, CPU Cores) | I_DO_REPLY_HERE |
|
||||||
| Docker Version (`docker version`) | I_DO_REPLY_HERE |
|
| Docker version (`docker version`) | I_DO_REPLY_HERE |
|
||||||
| Docker-Compose Version (`docker-compose version`) | I_DO_REPLY_HERE |
|
| docker-compose version (`docker-compose version`) | I_DO_REPLY_HERE |
|
||||||
|
| mailcow version (```git describe --tags `git rev-list --tags --max-count=1` ```) | I_DO_REPLY_HERE |
|
||||||
| Reverse proxy (custom solution) | I_DO_REPLY_HERE |
|
| Reverse proxy (custom solution) | I_DO_REPLY_HERE |
|
||||||
|
|
||||||
Output of `git diff origin/master`, any other changes to the code? If so, **please post them**:
|
Output of `git diff origin/master`, any other changes to the code? If so, **please post them**:
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
window.onload = function() {
|
window.onload = function() {
|
||||||
// Begin Swagger UI call region
|
// Begin Swagger UI call region
|
||||||
const ui = SwaggerUIBundle({
|
const ui = SwaggerUIBundle({
|
||||||
url: "/api/openapi.yaml",
|
urls: [{url: "/api/openapi.yaml", name: "mailcow API"}],
|
||||||
dom_id: '#swagger-ui',
|
dom_id: '#swagger-ui',
|
||||||
deepLinking: true,
|
deepLinking: true,
|
||||||
presets: [
|
presets: [
|
||||||
|
@@ -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;
|
||||||
}
|
}
|
||||||
@@ -293,3 +296,4 @@ code {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -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',
|
||||||
|
@@ -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());
|
||||||
|
@@ -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) {
|
|
||||||
if ($details = mailbox('get', 'mailbox_details', $mailbox)) $data[] = $details;
|
|
||||||
else continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
process_get_return($data);
|
process_get_return($data);
|
||||||
|
} else {
|
||||||
|
$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);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Reference in New Issue
Block a user