Merge branch 'mail_filter_fix' into 'master'

Till Brehm · Till Brehm · commit 069b2fea73b3 · 2016-03-22T18:05:43.000+01:00
fixed sieve mail filter creation

if the filter rule uses "begins with", the regex should be "^$searchterm" instead of " $searchterm"

See merge request !297
diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -177,7 +177,7 @@ private function mail_user_filter_get_rule($page_form) {
 				} elseif ($page_form->dataRecord["op"] == 'is') {
 					$content .= "^".$searchterm."$";
 				} elseif ($page_form->dataRecord["op"] == 'begins') {
-					$content .= " ".$searchterm."";
+					$content .= "^".$searchterm."";
 				} elseif ($page_form->dataRecord["op"] == 'ends') {
 					$content .= ".*".$searchterm."$";
 				}

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ private function mail_user_filter_get_rule($page_form) {`
`177`	`177`	`} elseif ($page_form->dataRecord["op"] == 'is') {`
`178`	`178`	`$content .= "^".$searchterm."$";`
`179`	`179`	`} elseif ($page_form->dataRecord["op"] == 'begins') {`
`180`		`- $content .= " ".$searchterm."";`
	`180`	`+ $content .= "^".$searchterm."";`
`181`	`181`	`} elseif ($page_form->dataRecord["op"] == 'ends') {`
`182`	`182`	`$content .= ".*".$searchterm."$";`
`183`	`183`	`}`