gunnar: server/kolab-filter/filter config.php, 1.5, 1.6 kolabfilter.php, 1.3, 1.4 kolabmailboxfilter.php, 1.3, 1.4

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-filter/filter
In directory doto:/tmp/cvs-serv12401/kolab-filter/filter

Modified Files:
	config.php kolabfilter.php kolabmailboxfilter.php 
Log Message:
The kolab-filter error handler has been fixed. This hopefully gives us a clean exit state towards postfix at all times.

Index: config.php
===================================================================
RCS file: /kolabrepository/server/kolab-filter/filter/config.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- config.php	27 Nov 2007 07:30:24 -0000	1.5
+++ config.php	27 Nov 2007 12:35:23 -0000	1.6
@@ -138,9 +138,6 @@
 $conf['filter']['smpt_host'] = 'localhost';
 $conf['filter']['smpt_port'] = 10025;
 
-/* PHP error logging */
-$conf['filter']['error_log']     = '/kolab/var/kolab-filter/log/php-error.log';
-
 /* Horde::Log configuration */
 $conf['log']['enabled']          = true;
 $conf['log']['priority']         = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-filter/filter/kolabfilter.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabfilter.php	26 Nov 2007 16:35:21 -0000	1.3
+++ kolabfilter.php	27 Nov 2007 12:35:23 -0000	1.4
@@ -29,26 +29,18 @@
  *  ABOUT
  *  -----
  *
- *  A filter for outgoing mail on a Kolab Server.
+ *  A filter for outgoing mail on a Kolab Server. It rewrites headers
+ *  and handles Outlook issues.
  *
  */
 
-/* Load the filter libraries */
-require_once 'Kolab/Filter/Outgoing.php';
-require_once 'Kolab/Filter/Response.php';
-
 /* Read our configuration */
 require_once 'config.php';
 
-/* Setup the classes */
-if (empty($conf['filter']['error_log'])) {
-    $conf['filter']['error_log'] = sys_get_temp_dir() . PATH_SEPARATOR . 'kolab-filter.log';
-}
-
-$response = &new Response($conf['filter']['error_log']);
-$parser   = &new Filter_Outgoing();
-
-/* Parse the mail and spit out the response */
-$response->handle($parser->parse());
+/* Load the filter library */
+require_once 'Kolab/Filter/Outgoing.php';
 
+/* Parse the mail */
+$parser = &new Filter_Outgoing();
+$parser->parse();
 ?>

Index: kolabmailboxfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-filter/filter/kolabmailboxfilter.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolabmailboxfilter.php	26 Nov 2007 16:35:21 -0000	1.3
+++ kolabmailboxfilter.php	27 Nov 2007 12:35:23 -0000	1.4
@@ -34,21 +34,13 @@
  *
  */
 
-/* Load the filter libraries */
-require_once 'Kolab/Filter/Incoming.php';
-require_once 'Kolab/Filter/Response.php';
-
 /* Read our configuration */
 require_once 'config.php';
 
-/* Setup the classes */
-if (empty($conf['filter']['error_log'])) {
-    $conf['filter']['error_log'] = sys_get_temp_dir() . PATH_SEPARATOR . 'kolab-filter.log';
-}
-
-$response = &new Response($conf['filter']['error_log']);
-$parser   = &new Filter_Incoming();
+/* Load the filter library */
+require_once 'Kolab/Filter/Incoming.php';
 
-/* Parse the mail and spit out the response */
-$response->handle($parser->parse());
+/* Parse the mail */
+$parser = &new Filter_Incoming();
+$parser->parse();
 ?>