Skip to content

Handle dovecot sieve folder when subdir of INBOX #728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophWurst merged 3 commits into from
Jan 26, 2018
Merged

Handle dovecot sieve folder when subdir of INBOX #728

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecee6f4
Handle dovecot sieve folder when subdir of INBOX
Jan 22, 2018
42ead12
Fix code style and add comment
Jan 23, 2018
f208a2e
Merge branch 'master' of github.com:/nextcloud/mail into fix/dovecot-…
ChristophWurst Jan 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion lib/Service/FolderMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,16 @@ public function getFolders(Account $account, Horde_Imap_Client_Socket $client,

$folders = [];
foreach ($mailboxes as $mailbox) {
if ($mailbox['mailbox']->utf8 === 'dovecot.sieve') {
/**
* This is a temporary workaround for when the sieve folder is a subfolder of
* INBOX. Once "#386 Subfolders and Dovecot" has been resolved, we can go back
* to just comparing to 'dovecot.sieve'.
*/
$dovecotSieveFolders = [
'dovecot.sieve',
'INBOX.dovecot.sieve'
];
if (in_array($mailbox['mailbox']->utf8, $dovecotSieveFolders, true)) {
// This is a special folder that must not be shown
continue;
}
Expand Down