steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user vacation.php, 1.17.2.1, 1.17.2.2

cvs at intevation.de cvs at intevation.de
Thu Oct 13 16:20:25 CEST 2005


Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	vacation.php 
Log Message:
Fixed issue960 (extra newlines in vacation text)

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -d -r1.17.2.1 -r1.17.2.2
--- vacation.php	29 Aug 2005 21:28:50 -0000	1.17.2.1
+++ vacation.php	13 Oct 2005 14:20:23 -0000	1.17.2.2
@@ -44,7 +44,7 @@
 	  ($reacttospam?"if header :contains \"X-Spam-Flag\" \"YES\" { keep; stop; }\r\n":"").
 	  "vacation :addresses [ \"".join('", "', $addresses )."\" ] :days ".
 	  $_REQUEST['days']." text:\r\n".
-	  SieveUtils::dotstuff($_REQUEST['text'])."\r\n.\r\n;\r\n\r\n";
+	  SieveUtils::dotstuff(trim($_REQUEST['text']))."\r\n.\r\n;\r\n\r\n";
 	$active = isset($_REQUEST['active']);
 
 	if( PEAR::isError( $res = $sieve->installScript( $scriptname, $script, $active ) ) ) {





More information about the commits mailing list