steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist index.php, 1.11, 1.12 list.php, 1.18, 1.19

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	index.php list.php 
Log Message:
groupOfNames cleanup handling

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- index.php	7 Jul 2005 10:47:00 -0000	1.11
+++ index.php	14 Jul 2005 23:07:30 -0000	1.12
@@ -60,7 +60,7 @@
 	  $cn = $attrs['cn'][0];
 	  if( $cn != 'admin' && $cn != 'maintainer' && $cn != 'domain-maintainer' 
 		  && !preg_match('/.*,cn=domains,cn=internal,'.$_SESSION['base_dn'].'/', $dn ) ) {
-		$kolabdeleteflag = $attrs['kolabdeleteflag'][0];
+		$kolabdeleteflag = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
 		$kolabhomeserver = _('not yet implemented');
 		$internal = (strpos($dn,"cn=internal")!==false);
 		$entries[] = array( 'dn' => $dn,

Index: list.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- list.php	8 Jul 2005 10:41:01 -0000	1.18
+++ list.php	14 Jul 2005 23:07:30 -0000	1.19
@@ -274,32 +274,29 @@
 	}
 	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':
 	if (!$errors) {
 	  /* Just delete the object and let kolabd clean up */
-	  if( ldap_delete($ldap->connection, $dn ) ) {
+	 if ($ldap->deleteGroupOfNames($dn)) {
 		$messages[] = _('Distribution List ').$_REQUEST['cn']._(' deleted');
 		$heading = _('Entry Deleted');
 		$contenttemplate = 'sfdeleted.tpl';
 	  } else {
-		array_push($errors, _("LDAP Error: could delete $dn: ").ldap_error($link));		
+		array_push($errors, _("LDAP Error: Nould not delete $dn: ").$ldap->error());		
 	  }
 	}
 	break;