Merge branch 'stable-3.0.5'

Marius Cramer

2015-05-13 72773a6744609fdbc3bf39f58f073b05bd074c70

 interface/lib/plugins/mail_user_filter_plugin.inc.php

@@ -135,41 +135,69 @@
         $content .= '### BEGIN FILTER_ID:'.$page_form->id."\n";

         //$content .= 'require ["fileinto", "regex", "vacation"];'."\n";
			
         if($page_form->dataRecord["op"] == 'domain') {
            $content .= 'if address :domain :is "'.strtolower($page_form->dataRecord["source"]).'" "'.$page_form->dataRecord["searchterm"].'" {'."\n";
         } elseif ($page_form->dataRecord["op"] == 'localpart') {
            $content .= 'if address :localpart :is "'.strtolower($page_form->dataRecord["source"]).'" "'.$page_form->dataRecord["searchterm"].'" {'."\n";
         } elseif ($page_form->dataRecord["source"] == 'Size') {
            if(substr(trim($page_form->dataRecord["searchterm"]),-1) == 'k' || substr(trim($page_form->dataRecord["searchterm"]),-1) == 'K') {
               $unit = 'k';
            } else {
               $unit = 'm';
            }
            $content .= 'if size :over '.intval($page_form->dataRecord["searchterm"]).$unit.' {'."\n";
         } else {
			
            if($page_form->dataRecord["source"] == 'Header') {
               $parts = explode(':',trim($page_form->dataRecord["searchterm"]));
               $page_form->dataRecord["source"] = trim($parts[0]);
               unset($parts[0]);
               $page_form->dataRecord["searchterm"] = trim(implode(':',$parts));
               unset($parts);
            }

         $content .= 'if header :regex    ["'.strtolower($page_form->dataRecord["source"]).'"] ["';
            $content .= 'if header :regex    ["'.strtolower($page_form->dataRecord["source"]).'"] ["';

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

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

            $content .= '"] {'."\n";
         }

         $content .= '"] {'."\n";

         if($page_form->dataRecord["action"] == 'move') {
            $content .= '    fileinto "'.$page_form->dataRecord["target"].'";' . "\n";
            $content .= '    fileinto "'.$page_form->dataRecord["target"].'";' . "\n    stop;\n";
         } elseif ($page_form->dataRecord["action"] == 'keep') {
            $content .= "    keep;\n";
         } elseif ($page_form->dataRecord["action"] == 'stop') {
            $content .= "    stop;\n";
         } elseif ($page_form->dataRecord["action"] == 'reject') {
            $content .= '    reject "'.$page_form->dataRecord["target"].'";    stop;\n\n';
         } else {
            $content .= "    discard;\n";
            $content .= "    discard;\n    stop;\n";
         }

         $content .= "    stop;\n}\n";
         $content .= "}\n";

         $content .= '### END FILTER_ID:'.$page_form->id."\n";