feat(mail): Deletion of mail older than x. Closes #6023. Remove also …

…template folder. Change SOGoDisableMailCleaning to SOGoEnableMailCleaning (disabled by default).
Alinto · Nov 25, 2024 · ea427ea · ea427ea
1 parent ce86d14
commit ea427ea
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc
@@ -1678,8 +1678,8 @@ URL could be set to something like:
 
 See the "EMail reminders" section in this document for more information.
 
-|S |SOGoDisableMailCleaning
-|Parameter used to disable the feature 'remove mails older than X days' introduced in 5.12. Default value is `NO`.
+|S |SOGoEnableMailCleaning
+|Parameter used to enable cleaning folders and mailbox (remove mail older than X days). Default value is `NO`.
 
 |S |SOGoDisableOrganizerEventCheck
 |Parameter used to disable organizer's calendar event check

diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h
@@ -142,7 +142,7 @@ NSComparisonResult languageSort(id el1, id el2, void *context);
 
 - (NSString *)urlCreateAccount;
 
-- (BOOL)disableMailCleaning;
+- (BOOL)enableMailCleaning;
 
 @end
 

diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -933,9 +933,9 @@ - (NSString *)urlCreateAccount
   return [self stringForKey: @"SOGoURLCreateAccount"];
 }
 
-- (BOOL) disableMailCleaning
+- (BOOL) enableMailCleaning
 {
-  return [self boolForKey: @"SOGoDisableMailCleaning"];
+  return [self boolForKey: @"SOGoEnableMailCleaning"];
 }
 
 @end
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
@@ -1368,7 +1368,7 @@ - (WOResponse *) cleanMailboxAction
   request = [[self context] request];
   jsonRequest = [[request contentAsString] objectFromJSONString];
 
-  if ([[SOGoSystemDefaults sharedSystemDefaults] disableMailCleaning])
+  if (![[SOGoSystemDefaults sharedSystemDefaults] enableMailCleaning])
     return [self responseWithStatus: 401];
 
   if (![self isDateStringValid: [jsonRequest objectForKey: @"date"]]) {
@@ -1401,7 +1401,8 @@ - (WOResponse *) cleanMailboxAction
       }
       folder = [account folderWithTraversal: folderName andClassName: nil];
       // Disable clean for trash folder
-      if (![folderName isEqualToString: [account trashFolderNameInContext: [self context]]])
+      if (![folderName isEqualToString: [account trashFolderNameInContext: [self context]]]
+          && ![folderName isEqualToString: [account templatesFolderNameInContext: [self context]]])
         [self cleanFolderWithFolder: folder
                   withQualifier: searchQualifier
                       recursive: isRecursive

diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
@@ -617,7 +617,7 @@ - (BOOL) isCleanMailboxEnabled {
 
   sd = [SOGoSystemDefaults sharedSystemDefaults];
 
-  result = ![sd disableMailCleaning];
+  result = [sd enableMailCleaning];
 
   return result;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     - (NSString *)urlCreateAccount;
-    - (BOOL)disableMailCleaning;
+    - (BOOL)enableMailCleaning;
     @end
@@ Expand Down @@