diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php index 9c4368b286a..28154fa95c6 100644 --- a/htdocs/emailcollector/class/emailcollector.class.php +++ b/htdocs/emailcollector/class/emailcollector.class.php @@ -1395,17 +1395,17 @@ class EmailCollector extends CommonObject array_push($criteria, array($not."CC" => $rule['rulevalue'])); } if ($rule['type'] == 'subject') { - if (strpos($rule['rulevalue'], '!') === 0) { + if ($not) { //array_push($criteria, array("NOT SUBJECT" => $rule['rulevalue'])); - $searchfilterexcludesubjectarray[] = preg_replace('/^!/', '', $rule['rulevalue']); + $searchfilterexcludesubjectarray[] = $rule['rulevalue']; } else { array_push($criteria, array("SUBJECT" => $rule['rulevalue'])); } } if ($rule['type'] == 'body') { - if (strpos($rule['rulevalue'], '!') === 0) { + if ($not) { //array_push($criteria, array("NOT BODY" => $rule['rulevalue'])); - $searchfilterexcludebodyarray[] = preg_replace('/^!/', '', $rule['rulevalue']); + $searchfilterexcludebodyarray[] = $rule['rulevalue']; } else { array_push($criteria, array("BODY" => $rule['rulevalue'])); }