From 1d3ab398c22ca1303c8658b162cacae67ba31761 Mon Sep 17 00:00:00 2001 From: Daniele Ricci Date: Tue, 7 Nov 2017 12:35:46 +0100 Subject: [PATCH] Allow for free-form flag filter action Signed-off-by: Daniele Ricci --- plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php index f4fa55686..ec2f77fdb 100644 --- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php +++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php @@ -2133,6 +2133,12 @@ class rcube_sieve_engine )) . rcube::Q($this->plugin->gettext('flag'.$fidx)) .'
'; } + + $flags_target = array_filter($flags_target, function($v) use($flags) { + return !in_array_nocase($v, $flags); + }); + $flout .= $this->list_input($id, 'action_flags', $flags_target, true, + $this->error_class($id, 'action', 'flags', 'action_flags')); $out .= html::div(array( 'id' => 'action_flags' . $id, 'style' => 'display:' . (preg_match('/^(set|add|remove)flag$/', $action['type']) ? 'inline' : 'none'),