Skip to content

fix(sieve): fix handling of empty existing sieve scripts #13100

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

Open
hazveg wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −8
Open

fix(sieve): fix handling of empty existing sieve scripts #13100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions lib/Service/MailFilter/FilterBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,17 @@ public function buildSieveScript(array $filters, string $untouchedScript): strin
$lines[] = self::SEPARATOR;
}

/*
* Using implode("\r\n", $lines) may introduce an extra newline if the original script already ends with one.
* There may be a cleaner solution, but I couldn't find one that works seamlessly with Filter and Autoresponder.
* Feel free to give it a try!
*/
if (str_ends_with($untouchedScript, self::SIEVE_NEWLINE . self::SIEVE_NEWLINE)) {
$untouchedScript = substr($untouchedScript, 0, -2);
if (strlen($untouchedScript) !== 0) {
/*
* Using implode("\r\n", $lines) may introduce an extra newline if the original script already ends with one.
* There may be a cleaner solution, but I couldn't find one that works seamlessly with Filter and Autoresponder.
* Feel free to give it a try!
*/
if (str_ends_with($untouchedScript, self::SIEVE_NEWLINE . self::SIEVE_NEWLINE)) {
$untouchedScript = substr($untouchedScript, 0, -2);
}
$lines[] = $untouchedScript;
}
$lines[] = $untouchedScript;

if (count($filters) > 0) {
$lines[] = self::SEPARATOR;
Expand Down
Loading