gunnar: server/kolabd/kolabd/templates resmgr.conf.template.in, 1.38, 1.39

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv10224/templates

Modified Files:
	resmgr.conf.template.in 
Log Message:
MFB: kolab/issue973  (Rewritten from shown inconveniently in kontact)

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- resmgr.conf.template.in	11 Jan 2010 10:29:22 -0000	1.38
+++ resmgr.conf.template.in	11 Jan 2010 13:13:05 -0000	1.39
@@ -116,9 +116,14 @@
 $conf['kolab']['filter']['reject_forged_from_header'] = false;
 @@@endif@@@
 
-/* Text to be inserted in From: when rewriting untrusted mails */
-// $conf['kolab']['filter']['untrusted_subject_insert'] = "(UNTRUSTED, sender is <%s>)";
-// $conf['kolab']['filter']['unauthenticated_subject_insert'] = "(UNTRUSTED, sender <%s> is not authenticated)";
+/* Text to be inserted in From: when rewriting untrusted mails
+ * The following format specifiers can be used: 
+ * -  %1$s denotes the envelope sender
+ * -  %2$s denotes the address in the original from header
+ * -  %3$s denotes the name part in the original from header if any
+ */
+// $conf['kolab']['filter']['untrusted_subject_insert'] = '(UNTRUSTED, sender is <%1$s>)';
+// $conf['kolab']['filter']['unauthenticated_subject_insert'] = '(UNTRUSTED, sender <%1$s> is not authenticated)';
 
 /* Should we allow forwarded ical messages from Outlook
  * by encapsulating them in a MIME multipart