From 1146038c76daf1b0cadbce602d10223aa6611612 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 9 Jun 2020 14:38:01 -0400 Subject: [PATCH] fix(core): allow non top-level special folders and improved the doc around this --- Documentation/SOGoInstallationGuide.asciidoc | 22 +++++++++++-------- Scripts/sogo.conf | 1 + .../js/Mailer/Mailbox.service.js | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc index 62c07f369..be2d66e00 100644 --- a/Documentation/SOGoInstallationGuide.asciidoc +++ b/Documentation/SOGoInstallationGuide.asciidoc @@ -1749,7 +1749,7 @@ See the _Multi-domains Configuration_ section in this document for more information. |listRequiresDot (optional) -|If set to `YES`, listing of this SQL source is only possible when performing a search (respecting the SOGoSearchMinimumWordLength parameter) or when explicitely typing a single dot. +|If set to `YES`, listing of this SQL source is only possible when performing a search (respecting the SOGoSearchMinimumWordLength parameter) or when explicitly typing a single dot. Defaults to `YES` when unset. |ModulesConstraints (optional) @@ -1862,16 +1862,18 @@ messages. Defaults to `Drafts` when unset. -Use a `/` as a hierarchy separator if referring to an IMAP subfolder. -For example: `INBOX/Drafts`. +Use a `/` as a hierarchy separator if referring to an IMAP subfolder. +For example: `INBOX/Drafts`. You must use a `/` even if your real +IMAP separator is a `.`. |U |SOGoSentFolderName |Parameter used to set the IMAP folder name used to store sent messages. Defaults to `Sent` when unset. -Use a `/` as a hierarchy separator if referring to an IMAP subfolder. -For example: `INBOX/Sent`. +Use a `/` as a hierarchy separator if referring to an IMAP subfolder. +For example: `INBOX/Sent`. You must use a `/` even if your real +IMAP separator is a `.`. |U |SOGoTrashFolderName |Parameter used to set the IMAP folder name used to store deleted @@ -1879,8 +1881,9 @@ messages. Defaults to `Trash` when unset. -Use a `/` as a hierarchy separator if referring to an IMAP subfolder. -For example: `INBOX/Trash`. +Use a `/` as a hierarchy separator if referring to an IMAP subfolder. +For example: `INBOX/Trash`. You must use a `/` even if your real +IMAP separator is a `.`. |U |SOGoJunkFolderName |Parameter used to set the IMAP folder name used to store junk @@ -1888,8 +1891,9 @@ messages. Defaults to `Junk` when unset. -Use a `/` as a hierarchy separator if referring to an IMAP subfolder. -For example: `INBOX/Junk`. Also see the SOGoMailJunkSettings for +Use a `/` as a hierarchy separator if referring to an IMAP subfolder. +For example: `INBOX/Junk`. You must use a `/` even if your real +IMAP separator is a `.`. Also see the SOGoMailJunkSettings for more options regarding junk/not-junk actions. |D |SOGoIMAPCASServiceName diff --git a/Scripts/sogo.conf b/Scripts/sogo.conf index 962177092..b3fa93e38 100644 --- a/Scripts/sogo.conf +++ b/Scripts/sogo.conf @@ -24,6 +24,7 @@ //SOGoDraftsFolderName = Drafts; //SOGoSentFolderName = Sent; //SOGoTrashFolderName = Trash; + //SOGoJunkFolderName = Junk; //SOGoIMAPServer = "localhost"; //SOGoSieveServer = "sieve://127.0.0.1:4190"; //SOGoSMTPServer = "smtp://127.0.0.1"; diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js index c058d26b7..18f0101fc 100644 --- a/UI/WebServerResources/js/Mailer/Mailbox.service.js +++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js @@ -611,7 +611,7 @@ * @returns true if folder is eligible */ Mailbox.prototype.$canFolderAs = function() { - return this.type == 'folder' && this.level === 0; + return this.type == 'folder'; }; /**