X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_plugin.inc;h=c32eca5f0c17daddceda8a87c5c0b04ff6cf9899;hb=d2a7f50083180fccb855c116a0f16cbca2636f62;hp=359b7f848d1c0af887e703dc0906bb510541bfad;hpb=8a291b653285691998a0006d9d943d59225240b1;p=gosa.git
diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 359b7f848..c32eca5f0 100644
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -222,9 +222,7 @@ class plugin
*/
function execute()
{
- $_SESSION['errors'] .= "
".get_class($this)." - ";
- $_SESSION['errors'] .= "ACL BASE: ".$this->acl_base."";
- $_SESSION['errors'] .= "ACL CAT: ".$this->acl_category."
";
+ gosa_log("ACL ".get_class($this)." - ".$this->acl_category." - ".$this->acl_base);
/* This one is empty currently. Fabian - please fill in the docu code */
$_SESSION['current_class_for_help'] = get_class($this);
@@ -917,7 +915,9 @@ class plugin
}
$todo[] = "is_account";
foreach($todo as $var){
- $this->$var = $source->$var;
+ if (isset($source->$var)){
+ $this->$var= $source->$var;
+ }
}
}
@@ -1125,15 +1125,13 @@ class plugin
function remove_snapshot($dn)
{
- $ui = get_userinfo();
-
- if($this->acl_is_removeable()){
- $ldap = $this->config->get_ldap_link();
- $ldap->cd($this->config->current['BASE']);
- $ldap->rmdir_recursive($dn);
- }else{
- print_red (_("You are not allowed to delete this snapshot!"));
- }
+ $ui = get_userinfo();
+ $old_dn = $this->dn;
+ $this->dn = $dn;
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd($this->config->current['BASE']);
+ $ldap->rmdir_recursive($dn);
+ $this->dn = $old_dn;
}
@@ -1354,7 +1352,8 @@ class plugin
/* Restore one of the already deleted objects */
if(preg_match("/^RestoreDeletedSnapShot_/",$name) && $once){
$once = false;
- $this->snapDialog = new SnapShotDialog($this->config,$baseSuffixe,$this);
+ $this->snapDialog = new SnapShotDialog($this->config,"",$this);
+ $this->snapDialog->set_snapshot_bases($baseSuffixe);
$this->snapDialog->display_restore_dialog = true;
$this->snapDialog->display_all_removed_objects = true;
}