gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment Forward.php, 1.5, 1.6

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment
In directory doto:/tmp/cvs-serv24477/kolab-webadmin/lib/KolabAdmin/Sieve/Segment

Modified Files:
	Forward.php 
Log Message:
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.

Index: Forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Forward.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Forward.php	13 Apr 2010 09:29:51 -0000	1.5
+++ Forward.php	13 Apr 2010 09:43:00 -0000	1.6
@@ -143,8 +143,14 @@
     {
         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;
         }
     }
 }