steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist list.php, 1.16.2.1, 1.16.2.2

cvs at intevation.de cvs at intevation.de
Thu Sep 15 13:59:26 CEST 2005


Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	list.php 
Log Message:
Backport of fix for Issue820 (distribution list errors "Multiple...")

Index: list.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -u -d -r1.16.2.1 -r1.16.2.2
--- list.php	28 Jul 2005 01:45:41 -0000	1.16.2.1
+++ list.php	15 Sep 2005 11:59:23 -0000	1.16.2.2
@@ -270,37 +270,31 @@
 	}
 	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] );
-		$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'"));
-	  }
+	$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: No results returned for DN '$dn'"));
 	}
 	break;
   case 'delete':
-	$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] );
-		$form->entries['action']['value'] = 'kill';
-		foreach( $form->entries as $key => $val ) {
-		  $form->entries[$key]['attrs'] = 'readonly';
-		}
-		$form->submittext = _('Delete');
-		$heading = _('Delete Distribution List'); 
-		$content = $form->outputForm();
-	  } else {
-		array_push($errors, _("Error: Multiple results returned for DN '$dn'"));
+	$ldap_object = $ldap->read( $dn );
+	if( $ldap_object ) {
+	  fill_form_for_modify( $form, $ldap_object );
+	  $form->entries['action']['value'] = 'kill';
+	  foreach( $form->entries as $key => $val ) {
+		$form->entries[$key]['attrs'] = 'readonly';
 	  }
+	  $form->submittext = _('Delete');
+	  $heading = _('Delete Distribution List'); 
+	  $content = $form->outputForm();
+	} else {
+	  array_push($errors, _("Error: No results returned for DN '$dn'"));
 	}
 	break;
   case 'kill':





More information about the commits mailing list