steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php, 1.5, 1.6

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	addr.php 
Log Message:
Fix for issue520 (Cant create external addresses)

Index: addr.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- addr.php	28 Oct 2004 01:21:35 -0000	1.5
+++ addr.php	11 Nov 2004 10:13:44 -0000	1.6
@@ -149,7 +149,7 @@
 		  $ldap_object['alias'] = array_unique( array_filter( array_map( 'trim', preg_split( '/\n/', $_POST['alias'] ) ), 'strlen') );
 		}
 
-		if ($action == "save") {		  
+		if ($action == "save") {
 		  if (!$errors) {
 			if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$addressbook_root;
 			else $newdn = $dn;
@@ -157,6 +157,7 @@
 			  if (($result=ldap_read($ldap->connection,$dn,"(objectclass=*)")) &&
 				  ($entry=ldap_first_entry($ldap->connection,$result)) &&
 				  ($oldattrs=ldap_get_attributes($ldap->connection,$entry))) {
+				foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] );
 				if (!ldap_add($ldap->connection,$newdn, $ldap_object) || !ldap_delete($ldap->connection,$dn)) {
 				  array_push($errors, _("LDAP Error: could not rename ").$dn.
 							 " to ".$newdn." ".ldap_error($ldap->connection));
@@ -178,6 +179,7 @@
 		} else {
 		  if (!$errors) {
 			$dn = "cn=".$ldap_object['cn'].",".$addressbook_root;
+			foreach( $ldap_object as $k => $v ) if( $v == array() ) unset( $ldap_object[$k] );
 			if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object)) {
 			  array_push($errors, _("LDAP Error: could not add object ").$dn.": ".ldap_error($ldap->connection));
 			} else {