steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.13, 1.14 misc.php, 1.2, 1.3
cvs at intevation.de
cvs at intevation.de
Tue Dec 21 14:30:48 CET 2004
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv23279
Modified Files:
kolabfilter.php misc.php
Log Message:
fix for nested ical parts
Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kolabfilter.php 17 Dec 2004 21:42:47 -0000 1.13
+++ kolabfilter.php 21 Dec 2004 13:30:46 -0000 1.14
@@ -103,10 +103,10 @@
while (!feof(STDIN)) {
$buffer = fgets(STDIN, 8192);
$line = rtrim( $buffer, "\r\n");
- if( $headers_done || $line == '' ) {
+ if( $line == '' ) {
// Done with headers
$headers_done = true;
- } else if( $params['verify_from_header'] && eregi( '^From:(.*)', $line, $regs ) ) {
+ } else if( !$headers_done && $params['verify_from_header'] && eregi( '^From:(.*)', $line, $regs ) ) {
$from = strtolower($regs[1]);
if( !verify_sender( $sender, $from, $client_address) ) {
myLog("Invalid From: header. $from does not match envelope $sender\n", RM_LOG_DEBUG);
@@ -114,6 +114,7 @@
exit(EX_UNAVAILABLE);
}
} else if( eregi( '^Content-Type: text/calendar', $line ) ) {
+ myLog("Found iCal data in message", RM_LOG_DEBUG);
$ical = true;
}
if( fwrite($tmpf, $buffer) === false ) {
Index: misc.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/misc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- misc.php 5 Nov 2004 11:11:01 -0000 1.2
+++ misc.php 21 Dec 2004 13:30:46 -0000 1.3
@@ -129,7 +129,7 @@
logInit();
- myLog('Starting up in ' . ($params['group'] ? 'group' : 'resource') . ' mode', RM_LOG_SUPER);
+ //myLog('Starting up in ' . ($params['group'] ? 'group' : 'resource') . ' mode', RM_LOG_SUPER);
$url_fopen = ini_get('allow_url_fopen');
if (!$url_fopen) {
More information about the commits
mailing list