steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.19, 1.20 olhacks.php, 1.1, 1.2 resmgr.conf, 1.5, 1.6
cvs at intevation.de
cvs at intevation.de
Mon Apr 4 01:17:36 CEST 2005
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv29591/kolab-resource-handlers/resmgr
Modified Files:
kolabfilter.php olhacks.php resmgr.conf
Log Message:
conf + added files to spec
Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- kolabfilter.php 3 Apr 2005 23:14:10 -0000 1.19
+++ kolabfilter.php 3 Apr 2005 23:17:34 -0000 1.20
@@ -145,7 +145,7 @@
fclose($tmpf);
if( !$senderok ) {
- if( $ical ) {
+ if( $ical && $params['allow_outlook_ical_forward'] ) {
require_once('kolabfilter/olhacks.php');
$rc = olhacks_embedical( $fqhostname, $sender, $recipients, $tmpfname );
if( PEAR::isError( $rc ) ) {
Index: olhacks.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- olhacks.php 3 Apr 2005 23:14:10 -0000 1.1
+++ olhacks.php 3 Apr 2005 23:17:34 -0000 1.2
@@ -61,6 +61,7 @@
foreach( $recipients as $recip ) {
$msg_headers->addHeader('To', $recip);
}
+ // TODO(steffen): Use subject from original message
$msg_headers->addHeader('Subject', 'Kolab forwarded message' );
$msg_headers->addMIMEHeaders($toppart);
Index: resmgr.conf
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- resmgr.conf 9 Mar 2005 02:49:35 -0000 1.5
+++ resmgr.conf 3 Apr 2005 23:17:34 -0000 1.6
@@ -25,6 +25,10 @@
// Should the Sender: header be used over From: if present?
$params['allow_sender_header'] = true;
+// Should we allow forwarded ical messages from Outlook
+// by encapsulating them in a MIME multipart
+$params['allow_outlook_ical_forward'] = true;
+
// Should we perform this check on mail from our
// subdomains too?
$params['verify_subdomains'] = true;
More information about the commits
mailing list