gunnar: server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin Sieve.php, 1.8, 1.9

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Sieve.php 
Log Message:
Fix delivery to folders containing umlauts for the cyrus server. Do not duplicate mails when activating forwarding and delivery at the same time (and keeping mails on the server).

Index: Sieve.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Sieve.php	7 Apr 2010 06:14:38 -0000	1.8
+++ Sieve.php	13 Apr 2010 09:29:51 -0000	1.9
@@ -157,8 +157,9 @@
     public function getScript()
     {
         $script = 'require "fileinto";' . "\r\n" . 'require "vacation";' . "\r\n\r\n\r\n";
-        foreach ($this->_segments as $segment) {
-            $script .= $segment->generate() . "\r\n\r\n";
+        $order = array('vacation', 'forward', 'delivery');
+        foreach ($order as $segment) {
+            $script .= $this->_segments[$segment]->generate() . "\r\n\r\n";
         }
         return $script;
     }