steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.69, 1.70 vacation.php, 1.18, 1.19

cvs at intevation.de cvs at intevation.de
Thu Oct 13 14:16:57 CEST 2005


Author: steffen

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

Modified Files:
	user.php vacation.php 
Log Message:
Fixed a couple of errors in the sprintf-changes and fixed issue960 (extra newlines in vacation text)

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- user.php	13 Oct 2005 01:50:01 -0000	1.69
+++ user.php	13 Oct 2005 12:16:55 -0000	1.70
@@ -630,7 +630,7 @@
 			   }
 			   $dn = $newdn;
 			 } else array_push($errors, sprintf(_("LDAP Error: Could not read %s: %s"), $dn,
-												ldap_error($ldap->connection));
+												ldap_error($ldap->connection)));
 		   } else {
 			 //$ldap_object = fill_up($ldap_object);
 			 if ($auth->group() == "user") {
@@ -642,7 +642,7 @@
 			 }
 			 if (!ldap_modify($ldap->connection, $dn, $ldap_object)) {			   
 			   array_push($errors, sprintf(_("LDAP Error: Could not modify object %s: %s"), $dn,
-										   ldap_error($ldap->connection));
+										   ldap_error($ldap->connection)));
 			   debug_var_dump( $ldap_object );
 			 }
 		   }

Index: vacation.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/vacation.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- vacation.php	29 Aug 2005 21:28:28 -0000	1.18
+++ vacation.php	13 Oct 2005 12:16:55 -0000	1.19
@@ -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