Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-04-04 36420c614b259a0ca1aa7db14b1215db60c4c5ce

 interface/lib/plugins/mail_user_filter_plugin.inc.php

@@ -141,13 +141,22 @@
         $content .= 'if header :regex    ["'.strtolower($page_form->dataRecord["source"]).'"] ["';

         $searchterm = preg_quote($page_form->dataRecord["searchterm"]);
         $searchterm = str_replace('\\[', '\\\\[', $searchterm);
         $searchterm = str_replace('\\]', '\\\\]', $searchterm);
         $searchterm = str_replace(
            array(
               '"',
               '\\[',
               '\\]'
            ),
            array(
               '\\"',
               '\\\\[',
               '\\\\]'
            ), $searchterm);

         if($page_form->dataRecord["op"] == 'contains') {
            $content .= ".*".$searchterm;
         } elseif ($page_form->dataRecord["op"] == 'is') {
            $content .= $searchterm."$";
            $content .= "^".$searchterm."$";
         } elseif ($page_form->dataRecord["op"] == 'begins') {
            $content .= "^".$searchterm.".*";
         } elseif ($page_form->dataRecord["op"] == 'ends') {