summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-04-13 09:43:00 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-04-13 09:43:00 (GMT)
commit08acbbc35b424b434f963b8eca321ed8e3daa40d (patch)
tree064649944f5ca69045c93a7d4da5c2e4206dfa25 /lib
parentc24d7697447587d4c6719784f477dfcd16ca4f12 (diff)
downloadkolab-webadmin-08acbbc35b424b434f963b8eca321ed8e3daa40d.tar.gz
Update testing and fix an upgrade bug with the new forward segment script. Strict testing is no longer possible because we use the old Horde String library.
Diffstat (limited to 'lib')
-rw-r--r--lib/KolabAdmin/Sieve/Segment/Forward.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/KolabAdmin/Sieve/Segment/Forward.php b/lib/KolabAdmin/Sieve/Segment/Forward.php
index 3252b5f..87e2ebb 100644
--- a/lib/KolabAdmin/Sieve/Segment/Forward.php
+++ b/lib/KolabAdmin/Sieve/Segment/Forward.php
@@ -143,8 +143,14 @@ extends KolabAdmin_Sieve_Segment
{
if (preg_match('/keep;/s', $script, $regs)) {
$this->_keep_on_server = true;
- } else {
+ } else if (preg_match('/stop;/s', $script, $regs)) {
+ $this->_keep_on_server = false;
+ } else if (preg_match('/require/s', $script, $regs)) {
+ // The unused "require" statement provides the information that it
+ // is an old script variant.
$this->_keep_on_server = false;
+ } else {
+ $this->_keep_on_server = true;
}
}
} \ No newline at end of file