steffen: server/kolab-webadmin/kolab-webadmin/www/admin/service index.php, 1.22.2.1, 1.22.2.2

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service
In directory doto:/tmp/cvs-serv6226/kolab-webadmin/kolab-webadmin/www/admin/service

Modified Files:
      Tag: kolab_2_0_branch
	index.php 
Log Message:
Fix for issue942 -- had to partially revert the prev. fix and do a workaround instead to keep compatibility

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -d -r1.22.2.1 -r1.22.2.2
--- index.php	3 Oct 2005 01:17:00 -0000	1.22.2.1
+++ index.php	12 Oct 2005 11:04:16 -0000	1.22.2.2
@@ -45,7 +45,6 @@
   global $postfixmynetworks;
   global $postfixallowunauth;
   global $postfixrelayhost;
-  global $postfixrelayport;
   global $kolabhost;
   global $kolabfilterverifyfrom;
   global $kolabfilterallowsender;
@@ -71,7 +70,9 @@
 	$postfixmynetworks = join(', ',$attrs['postfix-mynetworks']);
 	$postfixallowunauth = $attrs['postfix-allow-unauthenticated'][0];
 	$postfixrelayhost = $attrs['postfix-relayhost'][0];
-	$postfixrelayport = $attrs['postfix-relayport'][0];
+	if( ereg('\[(.*)\]', $postfixrelayhost, $regs ) ) {
+	  $postfixrelayhost = $regs[1];
+	}
 	$kolabhost = $attrs['kolabHost'];
 	unset( $kolabhost['count'] );
 	$kolabfilterverifyfrom = $attrs['kolabfilter-verify-from-header'][0];
@@ -183,7 +184,11 @@
 
 if( $_REQUEST['submitpostfixrelayhost'] ) {
   $host_val = trim( $_REQUEST['postfixrelayhost'] );
-  $porr_val = trim( $_REQUEST['postfixrelayport'] );
+  if( ereg( '(.*):(.*)', $host_val, $regs ) ) {
+	$host_val = '['.$regs[1].']:'.$regs[2];
+  } else if( $host_val ) {
+	$host_val = "[$host_val]";
+  }
   if( $host_val == '' ) $host_val = array();
   if( $port_val == '' ) $port_val = array();
   $attrs = array();