amorfo77/mailcow-dockerized
1
0 Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-11-10 10:31:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feat/retention' into nightly

Browse Source
This commit is contained in:
FreddleSpl0it committed 2026-11-09 12:38:18 +01:00
2 parents 52d82569a7 6796db6b8f
commit 9d44eeadcb
38 files changed
+3065 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/web/json_api.php
+31
View File
@@ -283,6 +283,9 @@ if (isset($_GET['query'])) {
case "mail-policy":
process_add_return(\Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->api->addPolicy($attr));
break;
case "retention-rule":
process_add_return(\Mailcow\Retention\RetentionModule::fromGlobals()->api->addRule($attr));
break;
case "domain":
switch ($object) {
case "template":
@@ -898,6 +901,23 @@ if (isset($_GET['query'])) {
}
break;
case "retention-rule":
switch ($object) {
case "all":
process_get_return(\Mailcow\Retention\RetentionModule::fromGlobals()->api->getRules($extra));
break;
// effective/<username>: what the rules delete in the mailbox
case "effective":
process_get_return(\Mailcow\Retention\RetentionModule::fromGlobals()->api->getEffective($extra));
break;
default:
process_get_return(\Mailcow\Retention\RetentionModule::fromGlobals()->api->getRule($object));
break;
}
break;
case "logs":
switch ($object) {
case "dovecot":
@@ -933,6 +953,11 @@ if (isset($_GET['query'])) {
}
echo (isset($logs) && !empty($logs)) ? json_encode($logs, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT) : '{}';
break;
case "retention":
// results of the nightly retention runs: mailboxes with found mail or errors, newest first
$logs = \Mailcow\Retention\RetentionModule::fromGlobals()->api->getLog(isset($extra) ? intval(preg_replace('/[^\d]/', '', $extra)) : 0);
echo (!empty($logs)) ? json_encode($logs, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT) : '{}';
break;
case "cron":
// 0 is first record, so empty is fine
if (isset($extra)) {
@@ -1829,6 +1854,9 @@ if (isset($_GET['query'])) {
case "mail-policy":
process_delete_return(\Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->api->deletePolicies($items));
break;
case "retention-rule":
process_delete_return(\Mailcow\Retention\RetentionModule::fromGlobals()->api->deleteRules($items));
break;
case "app-passwd":
process_delete_return(app_passwd('delete', array('id' => $items)));
break;
@@ -2009,6 +2037,9 @@ if (isset($_GET['query'])) {
case "mail-policy":
process_edit_return(\Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->api->editPolicies($items, $attr));
break;
case "retention-rule":
process_edit_return(\Mailcow\Retention\RetentionModule::fromGlobals()->api->editRules($items, $attr));
break;
case "recipient_map":
process_edit_return(recipient_map('edit', array_merge(array('id' => $items), $attr)));
break;