Fix match-type selector (remove unsupported options) in delete header…

… action (#9610)
roundcube · Feb 16, 2025 · ea41ae4 · ea41ae4
1 parent 9690328
commit ea41ae4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+- Managesieve: Fix match-type selector (remove unsupported options) in delete header action (#9610)
+
+## Release 1.6.10
+
 - IMAP: Partial support for ANNOTATE-EXPERIMENT-1 extension (RFC 5257)
 - OAuth: Support standard authentication with short-living password received with OIDC token (#9530)
 - Fix PHP warnings (#9616, #9611)

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
@@ -6,6 +6,7 @@
 - Protect special scripts in managesieve_kolab_master mode
 - Fix infinite loop when parsing a malformed script (#9562)
 - Fix current script state after initial scripts creation in managesieve_kolab_master mode
+- Fix match-type selector (remove unsupported options) in delete header action (#9610)
 
 * version 9.4 [2021-06-06]
 -----------------------------------------------------------

diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -3334,18 +3334,24 @@ protected function match_type_selector($name, $id, $test, $rule = null, $mode =
         ]);
 
         $select_op->add(rcube::Q($this->plugin->gettext('filtercontains')), 'contains');
-        $select_op->add(rcube::Q($this->plugin->gettext('filternotcontains')), 'notcontains');
+        if ($mode == 'all') {
+            $select_op->add(rcube::Q($this->plugin->gettext('filternotcontains')), 'notcontains');
+        }
         $select_op->add(rcube::Q($this->plugin->gettext('filteris')), 'is');
-        $select_op->add(rcube::Q($this->plugin->gettext('filterisnot')), 'notis');
         if ($mode == 'all') {
+            $select_op->add(rcube::Q($this->plugin->gettext('filterisnot')), 'notis');
             $select_op->add(rcube::Q($this->plugin->gettext('filterexists')), 'exists');
             $select_op->add(rcube::Q($this->plugin->gettext('filternotexists')), 'notexists');
         }
         $select_op->add(rcube::Q($this->plugin->gettext('filtermatches')), 'matches');
-        $select_op->add(rcube::Q($this->plugin->gettext('filternotmatches')), 'notmatches');
+        if ($mode == 'all') {
+            $select_op->add(rcube::Q($this->plugin->gettext('filternotmatches')), 'notmatches');
+        }
         if (in_array('regex', $this->exts)) {
             $select_op->add(rcube::Q($this->plugin->gettext('filterregex')), 'regex');
-            $select_op->add(rcube::Q($this->plugin->gettext('filternotregex')), 'notregex');
+            if ($mode == 'all') {
+                $select_op->add(rcube::Q($this->plugin->gettext('filternotregex')), 'notregex');
+            }
         }
         if ($mode == 'all' && in_array('relational', $this->exts)) {
             $select_op->add(rcube::Q($this->plugin->gettext('countisgreaterthan')), 'count-gt');