gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/user deliver.php.in, 1.9, 1.10 forward.php.in, 1.8, 1.9 vacation.php.in, 1.10, 1.11

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv24077/kolab-webadmin/www/admin/user

Modified Files:
	deliver.php.in forward.php.in vacation.php.in 
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: deliver.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/deliver.php.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- deliver.php.in	7 Apr 2010 03:52:27 -0000	1.9
+++ deliver.php.in	13 Apr 2010 09:29:51 -0000	1.10
@@ -22,6 +22,7 @@
 require_once '@kolab_php_module_prefix at admin/include/headers.php';
 require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
 require_once 'Net/Sieve.php';
+require_once 'Horde/String.php';
 require_once 'KolabAdmin/Sieve.php';
 require_once 'KolabAdmin/Sieve/Script.php';
 require_once 'KolabAdmin/Sieve/Segment.php';

Index: forward.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/forward.php.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- forward.php.in	7 Apr 2010 03:52:27 -0000	1.8
+++ forward.php.in	13 Apr 2010 09:29:51 -0000	1.9
@@ -23,6 +23,7 @@
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
 require_once 'Net/Sieve.php';
+require_once 'Horde/String.php';
 require_once 'KolabAdmin/Sieve.php';
 require_once 'KolabAdmin/Sieve/Script.php';
 require_once 'KolabAdmin/Sieve/Segment.php';

Index: vacation.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- vacation.php.in	7 Apr 2010 03:52:27 -0000	1.10
+++ vacation.php.in	13 Apr 2010 09:29:51 -0000	1.11
@@ -11,6 +11,7 @@
 require_once('@kolab_php_module_prefix at admin/include/locale.php');
 require_once '@kolab_php_module_prefix at admin/include/authenticate.php';
 require_once 'Net/Sieve.php';
+require_once 'Horde/String.php';
 require_once 'KolabAdmin/Sieve.php';
 require_once 'KolabAdmin/Sieve/Script.php';
 require_once 'KolabAdmin/Sieve/Segment.php';