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

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Delivery.php Forward.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: Delivery.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Delivery.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Delivery.php	1 Apr 2010 13:38:19 -0000	1.4
+++ Delivery.php	13 Apr 2010 09:29:51 -0000	1.5
@@ -83,7 +83,9 @@
     {
         return array(
             ($this->isActive()) ? 'true, ## delivery enabled' : 'false, ## delivery disabled',
-            $this->getDeliveryFolder()
+            // UTF7-conversion handles a specific cyrus bug. This does not work
+            // when using dovecot for example. The sieve RFC requires UTF8.
+            String::convertCharset($this->getDeliveryFolder(), 'utf-8', 'utf7-imap')
         );
     }
 
@@ -95,7 +97,7 @@
     public function parseDeliveryFolder($script)
     {
         if (preg_match("/fileinto \"INBOX\/([^\"]*)\";/", $script, $regs)) {
-            $this->setDeliveryFolder($regs[1]);
+            $this->setDeliveryFolder(String::convertCharset($regs[1], 'utf7-imap', 'utf-8'));
         }
     }
 }

Index: Forward.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/lib/KolabAdmin/Sieve/Segment/Forward.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Forward.php	7 Apr 2010 07:24:05 -0000	1.4
+++ Forward.php	13 Apr 2010 09:29:51 -0000	1.5
@@ -122,7 +122,7 @@
         return array(
             ($this->isActive()) ? 'true ## forward enabled' : 'false ## forward disabled',
             $address,
-            ($this->getKeepOnServer()) ? ' keep;' : ''
+            ($this->getKeepOnServer()) ? '' : ' stop;'
         );
     }