ISPConfig3 devel
parent: 9a8de140 | patch | commit | ignore whitespace
Till Brehm
2014-03-25 7dd3f7ef555bd043d2d2fbd0bee87bf3509a4908 
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
1 files modified
15 ■■■■■ changed files
interface/lib/plugins/mail_user_filter_plugin.inc.php 15 ●●●●● patch | view | raw | blame | history 
 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') {