steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user vacation.php, 1.13, 1.14

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	vacation.php 
Log Message:
Issue712 (vacation compatibility with kmail)

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- vacation.php	7 Apr 2005 08:36:08 -0000	1.13
+++ vacation.php	12 Apr 2005 10:50:17 -0000	1.14
@@ -40,8 +40,7 @@
 	$reacttospam = isset( $_REQUEST['reacttospam'] );
 	$script = 
 	  "require \"vacation\";\r\n\r\n".
-	  "require \"fileinto\";\r\n\r\n".
-	  (!empty($maildomain)?"if not address :contains :domain \"From\" \"".$maildomain."\" { keep; stop; }\r\n":"").
+	  (!empty($maildomain)?"if not address :domain :contains \"From\" \"".$maildomain."\" { keep; stop; }\r\n":"").
 	  ($reacttospam?"if header :contains \"X-Spam-Flag\" \"YES\" { keep; stop; }\r\n":"").
 	  "vacation :addresses [ \"".join('", "', $addresses )."\" ] :days ".
 	  $_REQUEST['days']." text:\r\n".