steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.26.2.3, 1.26.2.4

[cvs at intevation.de]

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabfilter.php 
Log Message:
Backport of: Fix for Issue973 (quoting and rewriting From header)

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -u -d -r1.26.2.3 -r1.26.2.4
--- kolabfilter.php	21 Feb 2006 11:58:34 -0000	1.26.2.3
+++ kolabfilter.php	29 Mar 2006 12:46:12 -0000	1.26.2.4
@@ -105,7 +105,7 @@
     $fromadr = $adr->mailbox.'@'.$adr->host;
     if( !ereg( "\(UNTRUSTED, sender is <$sender>\)", $from ) ) {
       myLog("$from is not an allowed From address for unauthenticated users, rewriting", RM_LOG_DEBUG);
-      return '"'.$adr->personal.'(UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$fromadr.'>';
+      return '"'.str_replace(array("\\",'"'),array("\\\\",'\"'),$adr->personal).' (UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$fromadr.'>';
     } /* else already rewritten */
   }
   return $from;