FS#1962 - mail_user mail filters for maildrop not working correctly (or misleading)

marknl · marknl · commit 1fd3c0dd8f5f · 2012-01-06T10:50:32.000Z
diff --git a/interface/lib/plugins/mail_user_filter_plugin.inc.php b/interface/lib/plugins/mail_user_filter_plugin.inc.php
@@ -169,7 +169,7 @@ private function mail_user_filter_get_rule($page_form) {
 ";
 			}
 
-			$content .= "if (/^".$page_form->dataRecord["source"].":";
+			$content .= "if (/^".$page_form->dataRecord["source"].": ";
 
 			$searchterm = preg_quote($page_form->dataRecord["searchterm"]);
 
@@ -178,7 +178,7 @@ private function mail_user_filter_get_rule($page_form) {
 			} elseif ($page_form->dataRecord["op"] == 'is') {
 				$content .= $searchterm."$/:h)\n";
 			} elseif ($page_form->dataRecord["op"] == 'begins') {
-				$content .= " ".$searchterm."/:h)\n";
+				$content .= $searchterm."/:h)\n";
 			} elseif ($page_form->dataRecord["op"] == 'ends') {
 				$content .= ".*".$searchterm."$/:h)\n";
 			}

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ private function mail_user_filter_get_rule($page_form) {`
`169`	`169`	`";`
`170`	`170`	`}`
`171`	`171`
`172`		`- $content .= "if (/^".$page_form->dataRecord["source"].":";`
	`172`	`+ $content .= "if (/^".$page_form->dataRecord["source"].": ";`
`173`	`173`
`174`	`174`	`$searchterm = preg_quote($page_form->dataRecord["searchterm"]);`
`175`	`175`
`@@ -178,7 +178,7 @@ private function mail_user_filter_get_rule($page_form) {`
`178`	`178`	`} elseif ($page_form->dataRecord["op"] == 'is') {`
`179`	`179`	`$content .= $searchterm."$/:h)\n";`
`180`	`180`	`} elseif ($page_form->dataRecord["op"] == 'begins') {`
`181`		`- $content .= " ".$searchterm."/:h)\n";`
	`181`	`+ $content .= $searchterm."/:h)\n";`
`182`	`182`	`} elseif ($page_form->dataRecord["op"] == 'ends') {`
`183`	`183`	`$content .= ".*".$searchterm."$/:h)\n";`
`184`	`184`	`}`