more modules

[old-projects.git] / philter / philter / include / rule.inc.php

diff --git a/philter/philter/include/rule.inc.php b/philter/philter/include/rule.inc.php
index 218e59c..e18d470 100644 (file)
--- a/philter/philter/include/rule.inc.php
+++ b/philter/philter/include/rule.inc.php
@@ -89,34 +89,30 @@ class Rule {
     function to_string() {
         global $philter;
         
+        $bloc = "{\n";
+        foreach($this->actions as $action)
+            $bloc .= $philter->config['action_plugins'][$action[0]]->to_string($action);
+        $bloc.= "    :0\n"
+            .  "    /dev/null\n"
+            .  "}\n";
+
         $res = $this->block  ? ":0\n" : ":0 c\n";
 
         if($this->all) {
             foreach($this->matches as $match)
                 $res .= $philter->config['match_plugins'][$match[0]]->to_string($match);
+            $res .= $bloc;
         } else {
             $i = 0; $res = '';
             foreach($this->matches as $match) {
-                $res .= (empty($i) ? ":0 f\n" : ":0 fE\n");
+                $res .= (empty($i) ? ":0\n" : ":0 E\n");
                 $res .= $philter->config['match_plugins'][$match[0]]->to_string($match);
-                $res .= "| formail -I'X-Philter-Or: yes'\n";
+                $res .= $bloc;
                 $i++;
             }
-
-            $res.= ":0 f\n"
-                .  "* ^X-Philter-Or: yes\n"
-                .  "| formail -I'X-Philter-Or'\n"
-                .  ($this->block ? ":0 A\n" : ":0 Ac\n");
         }
         
-        $res.= "{\n";
-        foreach($this->actions as $action)
-            $res .= $philter->config['action_plugins'][$action[0]]->to_string($action);
-        $res.= "    :0\n"
-            .  "    /dev/null\n"
-            .  "}\n\n";
-
-        return $res;
+        return $res."\n";
     }
 
     function sql_clean($_uid, $_rid) {