Merge branch 'feat/retention' into nightly

This commit is contained in:
FreddleSpl0it committed 2026-11-09 12:38:18 +01:00
commit 9d44eeadcb
38 files changed
+3065 -16

No files matched your search

+3 -1
View File
@@ -3314,7 +3314,8 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
'mailbox_group_sogo_grant' => ['owner'],
'mailbox_group_sogo_acl' => ['c_uid'],
'mailbox_group_subscription' => ['username', 'owner'],
'mail_policy_member' => ['username']
'mail_policy_member' => ['username'],
'retention_rule_member' => ['username']
];
foreach ($tables as $table => $columns) {
foreach ($columns as $column) {
@@ -5388,6 +5389,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
':domain' => $domain,
));
\Mailcow\MailboxGroup\MailboxGroupModule::fromGlobals()->api->domainDeleted($domain);
\Mailcow\Retention\RetentionModule::fromGlobals()->api->domainDeleted($domain);
$stmt = $pdo->prepare("DELETE FROM `imapsync_source_domain` WHERE `domain` = :domain");
$stmt->execute(array(
':domain' => $domain,