steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php, 1.7, 1.8

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	ldap.class.php 
Log Message:
new deleteflag semantics

Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ldap.class.php	15 Jul 2004 01:12:38 -0000	1.7
+++ ldap.class.php	16 Jul 2004 17:18:03 -0000	1.8
@@ -1,6 +1,6 @@
 <?php
 /*
- *  Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ *  Copyright (c) 2004 Klarälvdalens Datakonsult AB
  *
  *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
  *
@@ -248,6 +248,27 @@
 
 	$this->freeSearchResult();
 	return $count;
+  }
+
+  // Set deleflag on object, or if $delete_now is
+  // true, just delete it
+  function deleteObject( $dn, $delete_now = false ) {
+	if( $delete_now ) {
+	  if( !ldap_delete( $this->connection, $dn ) ) {
+		return false;
+	  }
+	} else {
+	  // Look up hostnames in this setup
+	  $kolab_obj = $this->read( 'k=kolab,'.$_SESSION['base_dn'] );
+	  if( !$kolab_obj ) return false;
+	  $delete_template = array();
+	  $delete_template['deleteflag'] = $kolab_obj['kolabhost'];
+	  unset($delete_template['deleteflag']['count']);
+	  if( !ldap_modify($this->connection,$dn,$delete_template) ) {
+		return false;
+	  }
+	}
+	return true;
   }
 
   var $connection;