Remove stop-script feature from Procmail driver.

It doesn't make sense to have any non-stop rule in Procmail, and the way it's currently implemented causes the undocumented (and often unwanted) side-effect of duplicating messages.
horde · Apr 4, 2016 · 8588855 · 8588855
1 parent 145f540
commit 8588855
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/ingo/lib/Script/Procmail.php b/ingo/lib/Script/Procmail.php
@@ -36,7 +36,7 @@ class Ingo_Script_Procmail extends Ingo_Script_Base
         /* Does the driver support setting IMAP flags? */
         'imap_flags' => false,
         /* Does the driver support the stop-script option? */
-        'stop_script' => true,
+        'stop_script' => false,
         /* Can this driver perform on demand filtering? */
         'on_demand' => false,
         /* Does the driver require a script file to be generated? */
@@ -175,9 +175,6 @@ protected function _generate()
                     /* Create filter if using AND. */
                     if ($filter['combine'] == Ingo_Storage::COMBINE_ALL) {
                         $recipe = new Ingo_Script_Procmail_Recipe($filter, $this->_params);
-                        if (!$filter['stop']) {
-                            $recipe->addFlag('c');
-                        }
                         foreach ($filter['conditions'] as $condition) {
                             $recipe->addCondition($condition);
                         }
@@ -192,9 +189,6 @@ protected function _generate()
                             if ($loop++) {
                                 $recipe->addFlag('E');
                             }
-                            if (!$filter['stop']) {
-                                $recipe->addFlag('c');
-                            }
                             $recipe->addCondition($condition);
                             $this->_addItem(Ingo::RULE_FILTER, $recipe);
                         }