thomas: server/kolab-filter/filter kolabfilter.php, 1.1, 1.2 kolabmailboxfilter.php, 1.1, 1.2

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	kolabfilter.php kolabmailboxfilter.php 
Log Message:
Determine connect_addr and use it for connecting to Kolab services.


Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-filter/filter/kolabfilter.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolabfilter.php	9 Aug 2007 15:51:20 -0000	1.1
+++ kolabfilter.php	8 Oct 2007 15:50:11 -0000	1.2
@@ -209,7 +209,7 @@
 
   /* Allow anything from localhost and
      fellow Kolab-hosts */
-  if( $client_addr == '127.0.0.1' ) return true;
+  if( $client_addr == $params['local_addr'] ) return true;
   $kolabhosts = split(',', $params['kolabhosts'] );
   $kolabhosts = array_map( "gethostbyname", $kolabhosts );
   if( array_search( $client_addr, $kolabhosts ) !== false ) return true;
@@ -425,7 +425,7 @@
 }
 
 /* TODO: Dont hardcode localhost:10025 */
-$smtp = new KolabSMTP( 'localhost', 10025 );
+$smtp = new KolabSMTP( $params['local_addr'], 10025 );
 if( PEAR::isError( $smtp ) ) {
   fwrite(STDOUT, $error->getMessage().", code ".$error->getCode()."\n"); 
   if( $error->getCode() < 500 ) exit(EX_TEMPFAIL);

Index: kolabmailboxfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-filter/filter/kolabmailboxfilter.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolabmailboxfilter.php	9 Aug 2007 15:51:20 -0000	1.1
+++ kolabmailboxfilter.php	8 Oct 2007 15:50:11 -0000	1.2
@@ -138,7 +138,7 @@
   exit(EX_TEMPFAIL);
 }
 
-$lmtp = new KolabLMTP();
+$lmtp = new KolabLMTP( $params['local_addr'] );
 if( PEAR::isError( $lmtp ) ) {
   fwrite(STDOUT, $lmtp->getMessage()."\n");
   if( $error->getCode() < 500 ) exit(EX_TEMPFAIL);