steffen: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist index.php, 1.9, 1.9.2.1 list.php, 1.16, 1.16.2.1

[cvs at intevation.de]

Author: steffen

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

Modified Files:
      Tag: kolab_2_0_branch
	index.php list.php 
Log Message:
deletion handling

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/index.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- index.php	11 Mar 2005 09:11:15 -0000	1.9
+++ index.php	28 Jul 2005 01:45:41 -0000	1.9.2.1
@@ -58,12 +58,12 @@
 	  $dn = ldap_get_dn($ldap->connection,$entry);
 	  $cn = $attrs['cn'][0];
 	  if( $cn != 'admin' && $cn != 'maintainer' ) {
-		$kolabdeleteflag = $attrs['kolabdeleteflag'][0];
+		$deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
 		$kolabhomeserver = _('not yet implemented');
 		$internal = (strpos($dn,"cn=internal")!==false);
 		$entries[] = array( 'dn' => $dn,
 							'cn' => $cn,
-							'deleted' => $kolabdeleteflag,
+							'deleted' => $deleted,
 							'internal' => $internal );
 	  }
 	  $entry = ldap_next_entry( $ldap->connection,$entry );

Index: list.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- list.php	27 Apr 2005 19:47:49 -0000	1.16
+++ list.php	28 Jul 2005 01:45:41 -0000	1.16.2.1
@@ -306,7 +306,7 @@
   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';