steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.26.2.7, 1.26.2.8 resmgr.conf, 1.7, 1.7.2.1

[cvs at kolab.org]

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	kolabfilter.php resmgr.conf 
Log Message:
make inserted from text configurable (issue974)

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v
retrieving revision 1.26.2.7
retrieving revision 1.26.2.8
diff -u -d -r1.26.2.7 -r1.26.2.8
--- kolabfilter.php	21 May 2006 13:41:19 -0000	1.26.2.7
+++ kolabfilter.php	19 Oct 2006 15:26:46 -0000	1.26.2.8
@@ -1,9 +1,9 @@
 #!@l_prefix@/bin/php
 <?php
 /*
- *  Copyright (c) 2004 Klaraelvdalens Datakonsult AB
+ *  Copyright (c) 2004-2006 Klaraelvdalens Datakonsult AB
  *
- *    Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
  *  This  program is free  software; you can redistribute  it and/or
  *  modify it  under the terms of the GNU  General Public License as
@@ -105,12 +105,16 @@
 
 function rewrite_from($sender,$from) {
   global $params;
+  if( exists($param['untrusted_subject_insert']) ) $untrusted_subject_insert=$param['untrusted_subject_insert'];
+  else $untrusted_subject_insert="(UNTRUSTED, sender is <%s>)";
+  $untrusted = sprintf($untrusted_subject_insert, $sender);
+
   $adrs = imap_rfc822_parse_adrlist($from, $params['email_domain'][0]);
   foreach ($adrs as $adr) {
     $fromadr = $adr->mailbox.'@'.$adr->host;
-    if( !ereg( "\(UNTRUSTED, sender is <$sender>\)", $from ) ) {
+    if( strpos( $from, $untrusted )===false ) {
       myLog("$from is not an allowed From address for unauthenticated users, rewriting", RM_LOG_DEBUG);
-      return '"'.str_replace(array("\\",'"'),array("\\\\",'\"'),$adr->personal).' (UNTRUSTED, sender is <'.$sender.'>)" '.'<'.$fromadr.'>';
+      return '"'.str_replace(array("\\",'"'),array("\\\\",'\"'),$adr->personal).' '.$untrusted.'" '.'<'.$fromadr.'>';
     } /* else already rewritten */
   }
   return $from;

Index: resmgr.conf
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/resmgr.conf,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- resmgr.conf	10 Jun 2005 23:54:37 -0000	1.7
+++ resmgr.conf	19 Oct 2006 15:26:46 -0000	1.7.2.1
@@ -33,6 +33,9 @@
 // the envelope? Default is to rewrite the header
 $params['reject_forged_from_header'] = false;
 
+// Text to be inserted in From: when rewriting untrusted mails
+$params['untrusted_subject_insert']="(UNTRUSTED, sender is <%s>)";
+
 // Should we allow forwarded ical messages from Outlook
 // by encapsulating them in a MIME multipart
 $params['allow_outlook_ical_forward']  = true;