steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist list.php, 1.17, 1.18

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	list.php 
Log Message:
Fix for Issue820 (dist list lookup error)

Index: list.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- list.php	7 Jul 2005 10:47:00 -0000	1.17
+++ list.php	8 Jul 2005 10:41:01 -0000	1.18
@@ -261,19 +261,16 @@
 	}
 	break;
   case 'modify':
-	$result = $ldap->search( $dn, '(objectClass=kolabGroupOfNames)' );
-	if( $result ) {
-	  $ldap_object = ldap_get_entries( $ldap->connection, $result );
-	  if( $ldap_object['count'] == 1 ) {
-		fill_form_for_modify( $form, $ldap_object[0] );
+	$ldap_object = $ldap->read( $dn );
+	if( $ldap_object ) {
+		fill_form_for_modify( $form, $ldap_object );
 		$form->entries['action']['value'] = 'save';
 		$form->entries['dn'] = array( 'type' => 'hidden', 'value' => $dn );
 		$form->entries['cn']['attrs'] = 'readonly';
 		$heading = _('Modify Distribution List');
 		$content = $form->outputForm();
-	  } else {
-		array_push($errors, _("Error: Multiple results returned for DN '$dn'"));
-	  }
+	} else {
+	  array_push($errors, _("Error: No results returned for DN '$dn'") );
 	}
 	break;
   case 'delete':