Merge branch '5964-mail-filter-error' into 'develop'

Marius Burkard · Marius Burkard · commit b28bfb863ce5 · 2020-12-18T21:05:18.000+01:00
fix bad newlines in sieve Reject action

Closes #5964

See merge request ispconfig/ispconfig3!1355
diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -217,7 +217,7 @@ private function mail_user_filter_get_rule($page_form) {
 			} elseif ($page_form->dataRecord["action"] == 'stop') {
 				$content .= "    stop;\n";
 			} elseif ($page_form->dataRecord["action"] == 'reject') {
-				$content .= '    reject "'.$page_form->dataRecord["target"].'";    stop;\n\n';
+				$content .= '    reject "'.$page_form->dataRecord["target"].'";' . "\n    stop;\n";
 			} else {
 				$content .= "    discard;\n    stop;\n";
 			}

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ private function mail_user_filter_get_rule($page_form) {`
`217`	`217`	`} elseif ($page_form->dataRecord["action"] == 'stop') {`
`218`	`218`	`$content .= " stop;\n";`
`219`	`219`	`} elseif ($page_form->dataRecord["action"] == 'reject') {`
`220`		`- $content .= ' reject "'.$page_form->dataRecord["target"].'"; stop;\n\n';`
	`220`	`+ $content .= ' reject "'.$page_form->dataRecord["target"].'";' . "\n stop;\n";`
`221`	`221`	`} else {`
`222`	`222`	`$content .= " discard;\n stop;\n";`
`223`	`223`	`}`