X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fogroups%2Fclass_ogroupManagement.inc;h=14f9d9f97ef32540864659651ec9f2c68da3525b;hb=bda4c3aedb1c60fd9945d73a8b589468602bc685;hp=4883ecbb2074ef65356c3e1635084c04cdac2103;hpb=80fbbe32a9a6382e6a295375d633cb69fff90f15;p=gosa.git
diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 4883ecbb2..14f9d9f97 100644
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -59,7 +59,7 @@ class ogroupManagement extends plugin
Variable intialisation && Check posts for commands
****************/
- $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^group_edit_/","/^group_del_/");
+ $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^group_edit_/","/^group_del_/","/^item_selected/","/^remove_multiple_ogroups/");
$smarty = get_smarty();
$s_action = "";
@@ -78,11 +78,6 @@ class ogroupManagement extends plugin
// Post for new
}elseif(preg_match("/^group_new.*/",$key)){
$s_action="new";
- }elseif(preg_match("/^group_tplnew.*/i",$key)){
- $s_action="new_tpl";
- }elseif(preg_match("/^group_chgpw.*/i",$key)){
- $s_action="change_pw";
- $s_entry = preg_replace("/group_chgpw_/i","",$key);
}elseif(preg_match("/^editPaste.*/i",$key)){
$s_action="editPaste";
}elseif(preg_match("/^copy_.*/",$key)){
@@ -91,6 +86,8 @@ class ogroupManagement extends plugin
}elseif(preg_match("/^cut_.*/",$key)){
$s_action="cut";
$s_entry = preg_replace("/^cut_/i","",$key);
+ }elseif(preg_match("/^remove_multiple_ogroups/",$key)){
+ $s_action="del_multiple";
}elseif(preg_match("/_group_edit_/",$key)){
$type = preg_replace("/_group_edit_.*$/","",$key);
$s_action="edit";
@@ -134,6 +131,82 @@ class ogroupManagement extends plugin
}
+ /********************
+ Delete MULTIPLE entries requested, display confirm dialog
+ ********************/
+ if ($s_action=="del_multiple"){
+ $ids = $this->list_get_selected_items();
+ if(count($ids)){
+ foreach($ids as $id){
+ $dn = $this->ogrouplist[$id]['dn'];
+ if (($user= get_lock($dn)) != ""){
+ return(gen_locked_message ($user, $dn));
+ }
+ $this->dns[$id] = $dn;
+ }
+ $dns_names = "
"; + foreach($this->dns as $dn){ + add_lock ($dn, $this->ui->dn); + $dns_names .= $dn."\n"; + } + $dns_names .=""; + /* Lock the current entry, so nobody will edit it during deletion */ + if (count($this->dns) == 1){ + $smarty->assign("info", sprintf(_("You're about to delete the following object entry %s"), @LDAP::fix($dns_names))); + } else { + $smarty->assign("info", sprintf(_("You're about to delete the following object entries %s"), @LDAP::fix($dns_names))); + } + $smarty->assign("multiple", true); + return($smarty->fetch(get_template_path('remove.tpl', TRUE))); + } + } + + + /******************** + Delete MULTIPLE entries confirmed + ********************/ + + /* Confirmation for deletion has been passed. Users should be deleted. */ + if (isset($_POST['delete_multiple_ogroup_confirm'])){ + + /* Remove user by user and check acls before removeing them */ + foreach($this->dns as $key => $dn){ + + $acl = $this->ui->get_permissions($dn, "ogroups"); + if (preg_match('/d/', $acl)){ + + /* Delete request is permitted, perform LDAP action */ + $this->ogroup= new ogrouptabs($this->config,$this->config->data['TABS']['OGROUPTABS'], $dn); + $this->ogroup->delete (); + unset ($this->ogroup); + $this->ogroup= NULL; + } else { + + /* Normally this shouldn't be reached, send some extra + logs to notify the administrator */ + print_red (_("You are not allowed to delete this object group!")); + new log("security","ogroups/".get_class($this),$dn,array(),"Tried to trick deletion."); + } + /* Remove lock file after successfull deletion */ + del_lock ($dn); + unset($this->dns[$key]); + } + } + + + /******************** + Delete MULTIPLE entries Canceled + ********************/ + + /* Remove lock */ + if(isset($_POST['delete_multiple_ogroup_cancel'])){ + foreach($this->dns as $key => $dn){ + del_lock ($dn); + unset($this->dns[$key]); + } + } + + /**************** Delete object group ****************/ @@ -145,7 +218,7 @@ class ogroupManagement extends plugin /* Load permissions for selected 'dn' and check if we're allowed to remove this 'dn' */ - $acl = $this->ui->get_permissions($this->dn,"ogroup"); + $acl = $this->ui->get_permissions($this->dn,"ogroups"); if(preg_match("/d/",$acl)){ /* Check locking, save current plugin in 'back_plugin', so @@ -157,6 +230,7 @@ class ogroupManagement extends plugin /* Lock the current entry, so nobody will edit it during deletion */ add_lock ($this->dn, $this->ui->dn); $smarty->assign("info", sprintf(_("You're about to delete the object group '%s'."), @LDAP::fix($this->dn))); + $smarty->assign("multiple", false); return($smarty->fetch(get_template_path('remove.tpl', TRUE))); } else { @@ -176,15 +250,13 @@ class ogroupManagement extends plugin /* Some nice guy may send this as POST, so we've to check for the permissions again. */ - $acl = $this->ui->get_permissions($this->dn,"groups"); + $acl = $this->ui->get_permissions($this->dn,"ogroups"); if(preg_match("/d/",$acl)){ /* Delete request is permitted, perform LDAP action */ $this->ogroup= new ogrouptabs($this->config, $this->config->data['TABS']['OGROUPTABS'], $this->dn); - $this->ogroup->set_acl(array($this->acl)); $this->ogroup->delete (); - gosa_log ("Object group'".$this->dn."' has been removed"); unset ($this->ogroup); $this->ogroup= NULL; } else { @@ -192,7 +264,7 @@ class ogroupManagement extends plugin /* Normally this shouldn't be reached, send some extra logs to notify the administrator */ print_red (_("You are not allowed to delete this object group!")); - gosa_log ("Warning: '".$this->ui->uid."' tried to trick group deletion."); + new log("security","ogroups/".get_class($this),$dn,array(),"Tried to trick deletion."); } /* Remove lock file after successfull deletion */ @@ -253,7 +325,6 @@ class ogroupManagement extends plugin /* Save user data to ldap */ $this->ogroup->save(); - gosa_log ("Object group'".$this->dn."' has been saved"); if (!isset($_POST['edit_apply'])){ /* Group has been saved successfully, remove lock from @@ -279,7 +350,7 @@ class ogroupManagement extends plugin ****************/ /* Cancel dialogs */ - if (isset($_POST['edit_cancel'])){ + if ((isset($_POST['edit_cancel'])) && (isset($this->ogroup->dn))){ del_lock ($this->ogroup->dn); unset ($this->ogroup); $this->ogroup= NULL; @@ -327,7 +398,7 @@ class ogroupManagement extends plugin /* Add departments if subsearch is disabled */ if(!$this->DivListOGroup->SubSearch){ - $this->DivListOGroup->AddDepartments($this->DivListOGroup->selectedBase,4); + $this->DivListOGroup->AddDepartments($this->DivListOGroup->selectedBase,4,1); } $this->reload (); $this->DivListOGroup->setEntries($this->ogrouplist); @@ -389,8 +460,6 @@ class ogroupManagement extends plugin $html_object_2 = "