diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index b289ffe4dcc68a19b504fc538a6b2bc8125b0e27..2662f02db9754f30344e24b14d9f36adc66a7f48 100644 (file)
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -1060,7 +1060,7 @@ function gen_xls ($dn, $filter= "(objectClass=*)", $attributes= array('*'), $rec
/* Delete existing entry */
if($delete){
- $this->rmdir($data['dn']);
+ $this->rmdir_recursive($data['dn']);
}
/* Create missing trees */
@@ -1074,7 +1074,7 @@ function gen_xls ($dn, $filter= "(objectClass=*)", $attributes= array('*'), $rec
$ret = $this->modify($data);
}
}
-
+ show_ldap_error($this->get_error(),_("Ldap import failed"));
return($ret);
}
@@ -1130,21 +1130,6 @@ function gen_xls ($dn, $filter= "(objectClass=*)", $attributes= array('*'), $rec
return $objectclasses;
}
- function create_snapshot($dn, $type= "snapshot", $description= "")
- {
- if ($this->dn_exists($dn) && $dn != ""){
- $data= preg_replace('/^dn:.*\n/', '', $this->gen_ldif($dn));
- $target= array();
- $target['objectClass']= array("top", "gosaObjectSnapshot");
- $target['gosaSnapshotData']= gzcompress($data, 6);
- $target['gosaSnapshotType']= $type;
- list($usec, $sec)= explode(" ", microtime());
- $target['gosaShapshotTimestamp']= preg_replace("/\./", "", $sec.$usec);
- $target['gosaShapshotDN']= $dn;
- print_a($target);
- }
- }
-
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: