Compare commits
16 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
552f09f48a | ||
|
8d9102aa08 | ||
|
b68eae16e5 | ||
|
9a812edee4 | ||
|
43d2a6e135 | ||
|
5839e22796 | ||
|
df33ebb2a0 | ||
|
d2a6838958 | ||
|
96b8054e6b | ||
|
dfdd2dadb4 | ||
|
d0528b7883 | ||
|
f40e682800 | ||
|
f4dc01d1ec | ||
|
187ddedf96 | ||
|
5613134fed | ||
|
e454ed4e39 |
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 |
|
||||
| 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 |
|
||||
| Docker Version (`docker version`) | I_DO_REPLY_HERE |
|
||||
| Docker-Compose Version (`docker-compose version`) | I_DO_REPLY_HERE |
|
||||
| Docker version (`docker 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 |
|
||||
|
||||
Output of `git diff origin/master`, any other changes to the code? If so, **please post them**:
|
||||
|
@@ -39,7 +39,7 @@
|
||||
window.onload = function() {
|
||||
// Begin Swagger UI call region
|
||||
const ui = SwaggerUIBundle({
|
||||
url: "/api/openapi.yaml",
|
||||
urls: [{url: "/api/openapi.yaml", name: "mailcow API"}],
|
||||
dom_id: '#swagger-ui',
|
||||
deepLinking: true,
|
||||
presets: [
|
||||
|
@@ -232,6 +232,9 @@ table.footable>tbody>tr.footable-empty>td {
|
||||
font-style:italic;
|
||||
font-size: 1rem;
|
||||
}
|
||||
table>tbody>tr>td>span.footable-toggle {
|
||||
opacity: 0.75;
|
||||
}
|
||||
.navbar-nav > li {
|
||||
font-size: 1rem !important;
|
||||
}
|
||||
@@ -292,4 +295,5 @@ code {
|
||||
padding: 0 5px 0 5px;
|
||||
align-items: center;
|
||||
display: inline-flex;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -337,7 +337,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
||||
$enc1 = $_data['enc1'];
|
||||
$custom_params = (empty(trim($_data['custom_params']))) ? '' : trim($_data['custom_params']);
|
||||
// Workaround, fixme
|
||||
if (strpos($custom_params, 'pipemess')) {
|
||||
if (stripos($custom_params, 'pipemess')) {
|
||||
$custom_params = '';
|
||||
}
|
||||
if (empty($subfolder2)) {
|
||||
@@ -568,6 +568,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
||||
));
|
||||
// save tags
|
||||
foreach($tags as $index => $tag){
|
||||
if (empty($tag)) continue;
|
||||
if ($index > $GLOBALS['TAGGING_LIMIT']) {
|
||||
$_SESSION['return'][] = array(
|
||||
'type' => 'warning',
|
||||
@@ -1124,6 +1125,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
||||
));
|
||||
// save tags
|
||||
foreach($tags as $index => $tag){
|
||||
if (empty($tag)) continue;
|
||||
if ($index > $GLOBALS['TAGGING_LIMIT']) {
|
||||
$_SESSION['return'][] = array(
|
||||
'type' => 'warning',
|
||||
@@ -1744,7 +1746,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
||||
);
|
||||
continue;
|
||||
}
|
||||
if (strpos($custom_params, 'pipemess')) {
|
||||
if (stripos($custom_params, 'pipemess')) {
|
||||
$custom_params = '';
|
||||
}
|
||||
if (empty($subfolder2)) {
|
||||
@@ -2201,8 +2203,9 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
||||
':gal' => $gal,
|
||||
':domain' => $domain
|
||||
));
|
||||
// save tags, tag_name is unique
|
||||
// save tags
|
||||
foreach($tags as $index => $tag){
|
||||
if (empty($tag)) continue;
|
||||
if ($index > $GLOBALS['TAGGING_LIMIT']) {
|
||||
$_SESSION['return'][] = array(
|
||||
'type' => 'warning',
|
||||
@@ -2368,8 +2371,9 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
||||
':description' => $description,
|
||||
':domain' => $domain
|
||||
));
|
||||
// save tags, tag_name is unique
|
||||
// save tags
|
||||
foreach($tags as $index => $tag){
|
||||
if (empty($tag)) continue;
|
||||
if ($index > $GLOBALS['TAGGING_LIMIT']) {
|
||||
$_SESSION['return'][] = array(
|
||||
'type' => 'warning',
|
||||
@@ -2712,6 +2716,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
|
||||
));
|
||||
// save tags
|
||||
foreach($tags as $index => $tag){
|
||||
if (empty($tag)) continue;
|
||||
if ($index > $GLOBALS['TAGGING_LIMIT']) {
|
||||
$_SESSION['return'][] = array(
|
||||
'type' => 'warning',
|
||||
|
@@ -3,7 +3,7 @@ function init_db_schema() {
|
||||
try {
|
||||
global $pdo;
|
||||
|
||||
$db_version = "02052022_1500";
|
||||
$db_version = "19052022_1541";
|
||||
|
||||
$stmt = $pdo->query("SHOW TABLES LIKE 'versions'");
|
||||
$num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
|
||||
|
@@ -290,6 +290,7 @@ $(document).ready(function() {
|
||||
var tagValuesElem = $(tagboxElem).find(".tag-values")[0];
|
||||
|
||||
var tag = escapeHtml($(tagInputElem).val());
|
||||
if (!tag) return;
|
||||
var value_tags = [];
|
||||
try {
|
||||
value_tags = JSON.parse($(tagValuesElem).val());
|
||||
|
@@ -989,14 +989,19 @@ if (isset($_GET['query'])) {
|
||||
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;
|
||||
if ($tags === null) {
|
||||
$data = mailbox('get', 'mailbox_details', $object);
|
||||
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);
|
||||
}
|
||||
process_get_return($data);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
0
data/web/templates/cache/.gitkeep
vendored
Normal file
0
data/web/templates/cache/.gitkeep
vendored
Normal file
Reference in New Issue
Block a user