index 2e10d7215e84e4a0291045348bb438b59a0bbc38..2bd31a5e33f6829c5b6880509fe3bb8f64162807 100644 (file)
$ldap->cd($dst_dn);
$ldap->add($new);
- if ($ldap->error != "Success"){
+ if (!$ldap->success()){
trigger_error("Trying to save $dst_dn failed.",
E_USER_WARNING);
return(FALSE);
/* Delete source */
$ldap= $this->config->get_ldap_link();
$ldap->rmdir_recursive($src_dn);
- if ($ldap->error != "Success"){
+ if (!$ldap->success()){
trigger_error("Trying to delete $src_dn failed.",
E_USER_WARNING);
return (FALSE);
$password = $tmp['SNAPSHOT_PASSWORD'];
$snapldapbase = $tmp['SNAPSHOT_BASE'];
- $ldap_to = new LDAP($user,$password, $server);
+ $ldap_to = new ldapMultipelxer(new LDAP($user,$password, $server));
$ldap_to -> cd($snapldapbase);
- show_ldap_error($ldap->get_error(), sprintf(_("Saving object snapshot with dn '%s' failed."),$snapldapbase));
+
+ if (!$ldap_to->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class()));
+ }
+
}
/* check if the dn exists */
$ldap_to->create_missing_trees($new_base);
$ldap_to->cd($new_dn);
$ldap_to->add($target);
-
- show_ldap_error($ldap->get_error(), sprintf(_("Saving object snapshot with dn '%s' failed."),$new_base));
- show_ldap_error($ldap_to->get_error(), sprintf(_("Saving object snapshot with dn '%s' failed."),$new_base));
+ if (!$ldap_to->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $new_dn, LDAP_ADD, get_class()));
+ }
+
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $new_base, "", get_class()));
+ }
+
}
}
$password = $cfg['SNAPSHOT_PASSWORD'];
$snapldapbase = $cfg['SNAPSHOT_BASE'];
- $ldap_to = new LDAP($user,$password, $server);
+ $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to -> cd ($snapldapbase);
- show_ldap_error($ldap->get_error(), sprintf(_("Method get available snapshots with dn '%s' failed."),$this->dn));
+ if (!$ldap_to->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class()));
+ }
}else{
$ldap_to = $ldap;
}
$user = $cfg['SNAPSHOT_USER'];
$password = $cfg['SNAPSHOT_PASSWORD'];
$snapldapbase = $cfg['SNAPSHOT_BASE'];
- $ldap_to = new LDAP($user,$password, $server);
+ $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to->cd ($snapldapbase);
- show_ldap_error($ldap_to->get_error(), sprintf(_("Method get deleted snapshots with dn '%s' failed."),$this->dn));
+ if (!$ldap_to->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class()));
+ }
}else{
$ldap_to = $ldap;
}
$user = $cfg['SNAPSHOT_USER'];
$password = $cfg['SNAPSHOT_PASSWORD'];
$snapldapbase = $cfg['SNAPSHOT_BASE'];
- $ldap_to = new LDAP($user,$password, $server);
+ $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to->cd ($snapldapbase);
- show_ldap_error($ldap->get_error(), sprintf(_("Restore snapshot with dn '%s' failed."),$snapldapbase));
+ if (!$ldap_to->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class()));
+ }
}else{
$ldap_to = $ldap;
}
/* Import the given data */
$ldap->import_complete_ldif($data,$err,false,false);
- show_ldap_error($ldap->get_error(), sprintf(_("Restore snapshot with dn '%s' failed."),$dn));
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn, "", get_class()));
+ }
}