steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.13, 1.14

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	user.php 
Log Message:
new deleteflag semantics

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- user.php	16 Jul 2004 13:16:48 -0000	1.13
+++ user.php	16 Jul 2004 17:18:03 -0000	1.14
@@ -547,9 +547,8 @@
      array_push($errors, "Error: you need administrative permissions to delete users");
    
    if (!$errors) {
-     $delete_template['deleteflag'] = 'TRUE';
-     if (!(ldap_modify($ldap->connection,$dn,$delete_template))) {
-       array_push($errors, "LDAP Error: could not mark ".$dn." for deletion ".ldap_error($ldap->connection));
+	 if (!$ldap->deleteObject($dn)) {
+       array_push($errors, "LDAP Error: could not mark ".$dn." for deletion ".$ldap->error());
      } else {
        $heading = "User Deleted";
 	   $contenttemplate = 'userdeleted.tpl';