Merge branch 'ingo-x-spam-header' of https://github.com/atj/horde

horde · Oct 2, 2017 · 0a6d0d2 · 0a6d0d2
2 parents ce39da0 + 5b60b1c
commit 0a6d0d2
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 9 deletions.
diff --git a/ingo/config/conf.xml b/ingo/config/conf.xml
@@ -39,6 +39,12 @@
     &quot;*&quot;, then &quot;****&quot; in the header indicates a spam level
     of four.">*</configstring>
    </case>
+   <case name="boolean" desc="Boolean">
+    <configstring name="header" desc="The spam header to
+    check">X-Spam</configstring>
+    <configstring name="value" desc="The value of the spam header when a mail
+    is identified as spam.">Yes</configstring>
+   </case>
   </configswitch>
  </configsection>
 </configuration>
diff --git a/ingo/lib/Factory/Script.php b/ingo/lib/Factory/Script.php
@@ -86,6 +86,10 @@ public function create($rule)
             ($params['spam_compare'] == 'string')) {
             $params['spam_char'] = $conf['spam']['char'];
         }
+        if (!isset($params['spam_value']) &&
+            ($params['spam_compare'] == 'boolean')) {
+            $params['spam_value'] = $conf['spam']['value'];
+        }
 
         switch ($driver) {
         case 'Imap':

diff --git a/ingo/lib/Form/Spam.php b/ingo/lib/Form/Spam.php
@@ -30,17 +30,21 @@ class Ingo_Form_Spam extends Ingo_Form_Base
 
     public function __construct($vars, $title = '', $name = null)
     {
+        global $conf;
+
         parent::__construct($vars, $title, $name);
 
-        $v = $this->addVariable(
-            _("Spam Level:"),
-            'level',
-            'int',
-            true,
-            false,
-            _("Messages with a likely spam score greater than or equal to this number will be treated as spam.")
-        );
-        $v->setHelp('spam-level');
+        if ($conf['spam']['compare'] != 'boolean') {
+            $v = $this->addVariable(
+                _("Spam Level:"),
+                'level',
+                'int',
+                true,
+                false,
+                _("Messages with a likely spam score greater than or equal to this number will be treated as spam.")
+            );
+            $v->setHelp('spam-level');
+        }
 
         $this->folder_var = $this->addVariable(
             _("Folder to receive spam:"),

diff --git a/ingo/lib/Script/Maildrop.php b/ingo/lib/Script/Maildrop.php
@@ -358,6 +358,12 @@ protected function _generateSpam(Ingo_Rule $rule)
                     $rule->level
                 )
             ));
+        } elseif ($this->_params['spam_compare'] == 'boolean') {
+            $recipe->addCondition(array(
+                'match' => 'is',
+                'field' => $this->_params['spam_header'],
+                'value' => $this->_params['spam_value']
+            ));
         }
 
         $this->_addItem(Ingo::RULE_SPAM, $recipe);

diff --git a/ingo/lib/Script/Sieve.php b/ingo/lib/Script/Sieve.php
@@ -467,6 +467,14 @@ protected function _addSpamBlocks(Ingo_Rule $rule)
                 'comparator' => 'i;ascii-casemap',
             );
             $test = new Ingo_Script_Sieve_Test_Header($vals);
+        } elseif ($this->_params['spam_compare'] == 'boolean') {
+            $vals = array(
+                'headers' => $this->_params['spam_header'],
+                'match-type' => ':is',
+                'strings' => $this->_params['spam_value'],
+                'comparator' => 'i;ascii-casemap',
+            );
+            $test = new Ingo_Script_Sieve_Test_Header($vals);
         }
 
         $actions[] = new Ingo_Script_Sieve_Action_Stop();