steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.26.2.6, 1.26.2.7

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv21116

Modified Files:
      Tag: kolab_2_0_branch
	kolabfilter.php 
Log Message:
minor fixes for folded header issue(s)

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php,v
retrieving revision 1.26.2.6
retrieving revision 1.26.2.7
diff -u -d -r1.26.2.6 -r1.26.2.7
--- kolabfilter.php	21 May 2006 12:09:18 -0000	1.26.2.6
+++ kolabfilter.php	21 May 2006 13:41:19 -0000	1.26.2.7
@@ -70,7 +70,7 @@
 
 // Temp file for storing the message
 $tmpfname = tempnam( TMPDIR, 'IN.' );
-$tmpf = fopen($tmpfname, "w");
+$tmpf = @fopen($tmpfname, "w");
 if( !$tmpf ) {
   myLog("Error: Could not open $tempfname for writing: ".php_error(), RM_LOG_ERROR);
   exit(EX_TEMPFAIL);  
@@ -79,7 +79,7 @@
 // Cleanup function
 function cleanup() {
   global $tmpfname;
-  //file_exists($tmpfname) && unlink($tmpfname);
+  file_exists($tmpfname) && unlink($tmpfname);
 }
 register_shutdown_function( 'cleanup' );
 
@@ -280,7 +280,7 @@
 //$outputtime =& new MyTimer("Output");
 //$outputtime->start();
 
-$tmpf = fopen($tmpfname,"r");
+$tmpf = @fopen($tmpfname,"r");
 if( !$tmpf ) {
   myLog("Error: Could not open $tempfname for reading: ".php_error(), RM_LOG_ERROR);
   exit(EX_TEMPFAIL);  
@@ -305,7 +305,7 @@
     if( eregi( '^From: (.*)', $buffer ) ) {
       if( PEAR::isError($error = $smtp->data( $rewrittenfrom )) ) {
 	$str = $error->getMessage().", code ".$error->getCode();
-	myLog($str,RM_LOG_DEBUG);
+	myLog($str,RM_LOG_ERROR);
 	fwrite(STDOUT, $str."\n"); 
 	if( $error->getCode() < 500 ) exit(EX_TEMPFAIL);
 	else exit(EX_UNAVAILABLE);
@@ -326,7 +326,7 @@
   }
   if( PEAR::isError($error = $smtp->data( $buffer )) ) {
     $str = $error->getMessage().", code ".$error->getCode();
-    myLog($str,RM_LOG_DEBUG);
+    myLog($str,RM_LOG_ERROR);
     fwrite(STDOUT, $str."\n"); 
     if( $error->getCode() < 500 ) exit(EX_TEMPFAIL);
     else exit(EX_UNAVAILABLE);