From dda39aab1d8af12d6f2287e4bdeae86b5abfc21b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 1 Aug 2013 10:36:52 +0200
Subject: Support 'keep' action (#1489226)

---
 plugins/managesieve/Changelog                            | 1 +
 plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php | 1 +
 plugins/managesieve/localization/en_US.inc               | 1 +
 3 files changed, 3 insertions(+)

(limited to 'plugins')

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index daee91a70..60b2f1831 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -4,6 +4,7 @@
 - Support date, currendate and index tests - RFC5260 (#1488120)
 - Split plugin file into two files
 - Fix handling of &, <, > characters in scripts/filter names (#1489208)
+- Support 'keep' action (#1489226)
 
 * version 6.2 [2013-02-17]
 -----------------------------------------------------------
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
index e92ba04d6..bbbfa9d91 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -1550,6 +1550,7 @@ class rcube_sieve_engine
         if (in_array('enotify', $this->exts) || in_array('notify', $this->exts)) {
             $select_action->add(rcube::Q($this->plugin->gettext('notify')), 'notify');
         }
+        $select_action->add(rcube::Q($this->plugin->gettext('messagekeep')), 'keep');
         $select_action->add(rcube::Q($this->plugin->gettext('rulestop')), 'stop');
 
         $select_type = $action['type'];
diff --git a/plugins/managesieve/localization/en_US.inc b/plugins/managesieve/localization/en_US.inc
index 72bbf9d41..a37ea7db9 100644
--- a/plugins/managesieve/localization/en_US.inc
+++ b/plugins/managesieve/localization/en_US.inc
@@ -49,6 +49,7 @@ $labels['messagesendcopy'] = 'Send message copy to';
 $labels['messagereply'] = 'Reply with message';
 $labels['messagedelete'] = 'Delete message';
 $labels['messagediscard'] = 'Discard with message';
+$labels['messagekeep'] = 'Keep message in Inbox';
 $labels['messagesrules'] = 'For incoming mail:';
 $labels['messagesactions'] = '...execute the following actions:';
 $labels['add'] = 'Add';
-- 
cgit v1.2.3