summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-12-30 12:33:15 +0000
committeralecpl <alec@alec.pl>2009-12-30 12:33:15 +0000
commita2cb306981d8665f1a3907933d52793f8a216053 (patch)
tree97a08e68f4d11529175f2e87c9b84024dcccda89
parent5e3d6c23845a4d2bd6d691c9c91ecff22708d4a2 (diff)
- Managesieve: Fix requires generation for multiple actions (#1486397)
-rw-r--r--CHANGELOG1
-rw-r--r--plugins/managesieve/Changelog2
-rw-r--r--plugins/managesieve/lib/rcube_sieve.php10
3 files changed, 9 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 419cb7510..0ecd1c69f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Managesieve: Fix requires generation for multiple actions (#1486397)
- Fix LDAP problem with special characters in RDN (#1486320)
- Improved handling of message parts of type message/rfc822
- Updated TinyMCE to 3.2.7
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 2b46e9ffe..85b3728e8 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,3 +1,5 @@
+- Fix requires generation when many modules are used
+
* version 2.0 [2009-11-02]
-----------------------------------------------------------
- Added 'managesieve_debug' option
diff --git a/plugins/managesieve/lib/rcube_sieve.php b/plugins/managesieve/lib/rcube_sieve.php
index a8290b195..fb7645240 100644
--- a/plugins/managesieve/lib/rcube_sieve.php
+++ b/plugins/managesieve/lib/rcube_sieve.php
@@ -448,6 +448,7 @@ class rcube_sieve_script
// action(s)
foreach ($rule['actions'] as $action)
+ {
switch ($action['type'])
{
case 'fileinto':
@@ -491,12 +492,13 @@ class rcube_sieve_script
$script .= " \"" . $this->_escape_string($action['reason']) . "\";\n";
break;
}
-
+
+ if ($extension && !isset($exts[$extension]))
+ $exts[$extension] = $extension;
+ }
+
$script .= "}\n";
$idx++;
-
- if ($extension && !isset($exts[$extension]))
- $exts[$extension] = $extension;
}
// requires