steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.26.2.9, 1.26.2.10
cvs at kolab.org
cvs at kolab.org
Thu Oct 19 22:19:07 CEST 2006
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv16356/kolab-resource-handlers/resmgr
Modified Files:
Tag: kolab_2_0_branch
kolabfilter.php
Log Message:
cleanup and version
Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v
retrieving revision 1.26.2.9
retrieving revision 1.26.2.10
diff -u -d -r1.26.2.9 -r1.26.2.10
--- kolabfilter.php 19 Oct 2006 15:58:41 -0000 1.26.2.9
+++ kolabfilter.php 19 Oct 2006 20:19:05 -0000 1.26.2.10
@@ -103,12 +103,19 @@
return false;
}
+function get_untrusted_subject_insert()
+{
+ global $params;
+ if( array_key_exists('untrusted_subject_insert', $params) ) {
+ return $param['untrusted_subject_insert'];
+ } else {
+ return "(UNTRUSTED, sender is <%s>)";
+ }
+}
+
function rewrite_from($sender,$from) {
global $params;
- if( array_key_exists('untrusted_subject_insert', $params) )
- $untrusted_subject_insert=$param['untrusted_subject_insert'];
- else $untrusted_subject_insert="(UNTRUSTED, sender is <%s>)";
- $untrusted = sprintf($untrusted_subject_insert, $sender);
+ $untrusted = sprintf(get_untrusted_subject_insert(), $sender);
$adrs = imap_rfc822_parse_adrlist($from, $params['email_domain'][0]);
foreach ($adrs as $adr) {
More information about the commits
mailing list