summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-01-11 13:13:05 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-01-11 13:13:05 (GMT)
commit1ffbfe16eb85fd0a1458727925652e293c857100 (patch)
tree801e300f4c599d944a798cef49a00c6bfd2b3171
parent147cf4a28bdedd8943c25676b92f5dae19c70fa7 (diff)
downloadkolab-conf-1ffbfe16eb85fd0a1458727925652e293c857100.tar.gz
MFB: kolab/issue973 (Rewritten from shown inconveniently in kontact)
-rw-r--r--conf/templates/resmgr.conf.template.in11
1 files changed, 8 insertions, 3 deletions
diff --git a/conf/templates/resmgr.conf.template.in b/conf/templates/resmgr.conf.template.in
index e81c32d..2d33b6d 100644
--- a/conf/templates/resmgr.conf.template.in
+++ b/conf/templates/resmgr.conf.template.in
@@ -116,9 +116,14 @@ $conf['kolab']['filter']['reject_forged_from_header'] = ('@@@kolabfilter-reject-
$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