steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.26, 1.26.2.1

[cvs at intevation.de]

Author: steffen

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

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

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -d -r1.26 -r1.26.2.1
--- kolabfilter.php	15 Jun 2005 11:05:45 -0000	1.26
+++ kolabfilter.php	12 Oct 2005 03:24:23 -0000	1.26.2.1
@@ -186,8 +186,10 @@
 		} else {
 		  // Only rewrite if from is ours and envelope not
 		  if( is_my_domain( $from ) && !is_my_domain( $sender )) {
-			myLog("Rewriting From header", RM_LOG_DEBUG);
-			$rewrittenfrom = "From: $from (UNTRUSTED, sender is \"$sender\")\r\n";
+		    if( !ereg( "\(UNTRUSTED, sender is $sender\)", $from ) ) {
+		      myLog("Rewriting From header", RM_LOG_DEBUG);
+		      $rewrittenfrom = "From: $from (UNTRUSTED, sender is $sender)\r\n";
+		    } /* else already rewritten */
 		  } else {
 			// Not our domain in From, reject
 			$senderok = false;