steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php.in, 1.7, 1.8

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv22972

Modified Files:
	kolabfilter.php.in 
Log Message:
Fix for Issue973 (quoting and rewriting From header)

Index: kolabfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- kolabfilter.php.in	21 Feb 2006 10:26:01 -0000	1.7
+++ kolabfilter.php.in	29 Mar 2006 12:45:47 -0000	1.8
@@ -215,7 +215,7 @@
 	  } else {
 	    /* Rewrite */
 	    myLog("$from is not an allowed From address for unauthenticated users, rewriting", RM_LOG_DEBUG);
-	    return '"'.$adr->personal.'(UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$from.'>';
+	    return '"'.str_replace(array("\\",'"'),array("\\\\",'\"'),$adr->personal).' (UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$from.'>';
 	  }
 	}
       }
@@ -287,6 +287,7 @@
 while (!feof(STDIN) && !$headers_done) {
   $buffer = fgets(STDIN, 8192);
   $line = rtrim( $buffer, "\r\n");
+  myLog($line, RM_LOG_DEBUG);
   if( $line == '' ) {
     // Done with headers
     $headers_done = true;