From 34e396ddeef42c6fa459fdf49a7734862fe50aa4 Mon Sep 17 00:00:00 2001
From: smizrahi <seb.mizrahi@gmail.com>
Date: Wed, 20 Nov 2024 16:43:24 +0100
Subject: [PATCH] feat(mail): Deletion of mail older than x. Closes #6023.

---
 Documentation/SOGoInstallationGuide.asciidoc           | 4 ++--
 UI/Templates/MailerUI/UIxMailFolderTemplate.wox        | 2 +-
 UI/WebServerResources/js/Mailer/MailboxesController.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc
index 6387cfb41..29f4dbfd6 100644
--- a/Documentation/SOGoInstallationGuide.asciidoc
+++ b/Documentation/SOGoInstallationGuide.asciidoc
@@ -431,7 +431,7 @@ See `memcached_servers_parse(3)` for details on the syntax.
 
 |S |SOGoCacheCleanupInterval
 |Parameter used to set the expiration (in seconds) of each object in the
-cache. Default value is `NO`.
+cache.
 
 Defaults to `300`.
 
@@ -1679,7 +1679,7 @@ 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
+|Parameter used to disable the feature 'remove mails older than X days' introduced in 5.12. Default value is `NO`.
 
 |S |SOGoDisableOrganizerEventCheck
 |Parameter used to disable organizer's calendar event check
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index e0fcaf264..e0fa2ea0d 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -633,7 +633,7 @@
     </md-dialog>
   </script>
   <!-- Remove old emails -->
-  <script type="text/ng-template" id="CleanMailbox">
+  <script type="text/ng-template" id="cleanMailbox">
     <md-dialog flex="50" flex-sm="80" flex-xs="100">
       <!-- Toolbar -->
       <md-toolbar>
diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js
index e47b2d8e2..8bb12425e 100644
--- a/UI/WebServerResources/js/Mailer/MailboxesController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxesController.js
@@ -457,7 +457,7 @@
           $mdSidenav('left').close();
 
         $mdDialog.show({
-          template: document.getElementById('CleanMailbox').innerHTML,
+          template: document.getElementById('cleanMailbox').innerHTML,
           parent: angular.element(document.body),
           controller: function () {
             var dialogCtrl = this;