steffen: server/kolab-webadmin/kolab-webadmin/www/admin/service index.php, 1.19, 1.20

cvs at intevation.de cvs at intevation.de
Thu Jun 2 14:32:08 CEST 2005


Author: steffen

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

Modified Files:
	index.php 
Log Message:
support multi-valued mynetworks

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/service/index.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- index.php	27 Apr 2005 19:47:49 -0000	1.19
+++ index.php	2 Jun 2005 12:32:06 -0000	1.20
@@ -64,7 +64,8 @@
 	$quotawarn = $attrs['cyrus-quotawarn'][0];
 	$freebusypast = $attrs['kolabFreeBusyPast'][0];
 	$postfixmydomain = $attrs['postfix-mydomain'][0];
-	$postfixmynetworks = $attrs['postfix-mynetworks'][0];
+	unset( $attrs['postfix-mynetworks']['count'] );
+	$postfixmynetworks = join(', ',$attrs['postfix-mynetworks']);
 	$postfixallowunauth = $attrs['postfix-allow-unauthenticated'][0];
 	$postfixrelayhost = $attrs['postfix-relayhost'][0];
 	if( ereg( '\\[(.+)\\]', $postfixrelayhost, $regs ) ) {
@@ -153,8 +154,8 @@
 
 if( $_REQUEST['submitpostfixmynetworks'] ) {
   $attrs = array();
-  $attrs['postfix-mynetworks'] = trim( $_REQUEST['postfixmynetworks'] );
-  if( $attrs['postfix-mynetworks'] == '' ) $attrs['postfix-mynetworks'] = array();
+  $attrs['postfix-mynetworks'] = preg_split( "/[\s,]+/", trim( $_REQUEST['postfixmynetworks'] ) );
+  //if( $attrs['postfix-mynetworks'] == '' ) $attrs['postfix-mynetworks'] = array();
   if( !($result = ldap_modify($ldap->connection, "k=kolab,".$_SESSION['base_dn'], $attrs)) ) {
 	$errors[] = _("LDAP Error: failed to modify kolab configuration object: ")
 	  .ldap_error($ldap->connection);





More information about the commits mailing list