thomas: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php.in, 1.14, 1.14.2.1 kolabmailboxfilter.php.in, 1.7, 1.7.2.1 resmgr.conf.in, 1.4, 1.4.2.1 resmgr.php.in, 1.11, 1.11.2.1

[cvs at kolab.org]

Author: thomas

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

Modified Files:
      Tag: kolab_2_1_branch
	kolabfilter.php.in kolabmailboxfilter.php.in resmgr.conf.in 
	resmgr.php.in 
Log Message:
Determine connect_addr and use it for connecting to Kolab services.


Index: kolabfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabfilter.php.in,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- kolabfilter.php.in	26 Apr 2007 16:20:31 -0000	1.14
+++ kolabfilter.php.in	19 Sep 2007 17:06:42 -0000	1.14.2.1
@@ -199,7 +199,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;
@@ -415,7 +415,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.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/kolabmailboxfilter.php.in,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- kolabmailboxfilter.php.in	21 May 2006 13:53:25 -0000	1.7
+++ kolabmailboxfilter.php.in	19 Sep 2007 17:06:42 -0000	1.7.2.1
@@ -129,7 +129,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);

Index: resmgr.conf.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/resmgr.conf.in,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- resmgr.conf.in	26 Apr 2007 16:22:23 -0000	1.4
+++ resmgr.conf.in	19 Sep 2007 17:06:42 -0000	1.4.2.1
@@ -7,6 +7,9 @@
 // What is the address of the Cyrus server where the calendar data is stored?
 $params['server'] = 'localhost';
 
+// Local IP address of the mailserver for bypassing content filters
+$params['local_addr'] = 'localhost';
+
 // What is our default mail domain? This is used if any users do not have
 // '@domain' specified after their username as part of their email address.
 $params['email_domain'] = 'example.com';

Index: resmgr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/Attic/resmgr.php.in,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- resmgr.php.in	9 Nov 2006 17:53:24 -0000	1.11
+++ resmgr.php.in	19 Sep 2007 17:06:42 -0000	1.11.2.1
@@ -313,11 +313,12 @@
 
 function sendSMTP($sender, $recip, &$data)
 {
+    global $params;
     static $smtp;
     if (!isset($smtp)) {
         require_once 'Net/SMTP.php';
 
-        $smtp = &new Net_SMTP('localhost',10026);
+        $smtp = &new Net_SMTP($params['local_addr'] ,10026);
         if (!$smtp) {
             $msg = 'Could not create SMTP object';
             myLog($msg, RM_LOG_ERROR);