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

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	index.php list.php 
Log Message:
deletion handling + versions

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/index.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- index.php	14 Jul 2005 23:07:30 -0000	1.12
+++ index.php	28 Jul 2005 02:14:38 -0000	1.13
@@ -60,12 +60,12 @@
 	  $cn = $attrs['cn'][0];
 	  if( $cn != 'admin' && $cn != 'maintainer' && $cn != 'domain-maintainer' 
 		  && !preg_match('/.*,cn=domains,cn=internal,'.$_SESSION['base_dn'].'/', $dn ) ) {
-		$kolabdeleteflag = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
+		$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.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- list.php	14 Jul 2005 23:07:30 -0000	1.19
+++ list.php	28 Jul 2005 02:14:38 -0000	1.20
@@ -128,7 +128,7 @@
 $entries['action'] = array( 'name' => 'action',
 							'type' => 'hidden' );
 
-if( $action == 'modify' || $action == 'delete' ) {
+if( $action == 'modify' || $action == 'delete' || $action == 'kill' ) {
   if( $_REQUEST['dn'] ) {
 	$dn = $_REQUEST['dn'];
   } else {