summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: faab480)
raw | patch | inline | side by side (parent: faab480)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Tue, 17 Apr 2007 09:55:42 +0000 (09:55 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Tue, 17 Apr 2007 09:55:42 +0000 (09:55 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6066 594d385d-05f5-0310-b6e9-bd551577e9d8
plugins/admin/users/class_divListUsers.inc | patch | blob | history | |
plugins/admin/users/class_userManagement.inc | patch | blob | history | |
plugins/admin/users/remove.tpl | patch | blob | history |
diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc
index 8a257137640957b909c3927ecdf40cb9241aeb22..43883eed3e830c3e09dfdf0cf030e78090ed934f 100644 (file)
$listhead .=
_("Base")." <select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
" <input class='center' type='image' src='images/list_submit.png' align='middle'
- title='"._("Submit department")."' name='submit_department' alt='". _("Submit")."'> ".
- "</div>";
+ title='"._("Submit department")."' name='submit_department' alt='". _("Submit")."'> ";
+
+ /* Multiple options */
+ $listhead .= " <input class='center' type='image' align='middle' src='images/edittrash.png'
+ title='"._("Remove selected user")."' alt='"._("Remove user")."' name='remove_multiple_user'> ";
+
+ $listhead .="</div>";;
$this->SetListHeader($listhead);
}
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index fc587889bbd36ed6580ce1e718c22120b03ca496..2a79cf9b64e7c4d045d127ee380c527c59db16f4 100644 (file)
plugin::execute();
/* LOCK MESSAGE Vars */
- $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^user_edit_/","/^user_del_/");
+ $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^user_edit_/","/^user_del_/","/^item_selected/","/^remove_multiple_user/");
$smarty = get_smarty(); // Smarty instance
$s_action = ""; // Contains the action to be taken
foreach(array("del" => "user_del", "edit" => "user_edit",
"new" => "user_new",
"new_tpl" => "user_tplnew",
+ "del_multiple" => "^remove_multiple_user",
"create_user_from_tpl" => "userfrom_tpl",
"change_pw" => "user_chgpw",
"editPaste" => "editPaste", "copy" => "copy",
}
+ /********************
+ Delete MULTIPLE entries requested, display confirm dialog
+ ********************/
+
+ if ($s_action=="del_multiple"){
+ $ids = $this->list_get_selected_items();
+
+ foreach($ids as $id){
+ $dn = $this->list[$id]['dn'];
+ if (($user= get_lock($dn)) != ""){
+ return(gen_locked_message ($user, $dn));
+ }
+ $this->dns[$id] = $dn;
+ }
+
+ $dns_names = "<br><pre>";
+ foreach($this->dns as $dn){
+ add_lock ($dn, $this->ui->dn);
+ $dns_names .= $dn."\n";
+ }
+ $dns_names .="</pre>";
+
+ /* Lock the current entry, so nobody will edit it during deletion */
+ $smarty->assign("info", sprintf(_("You're about to delete the following user(s) %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_user_confirm'])){
+
+ /* Remove user by user and check acls before removeing them */
+ foreach($this->dns as $key => $dn){
+
+ $acl = $this->ui->get_permissions($dn, "users/user");
+ if (preg_match('/d/', $acl)){
+
+ /* Delete request is permitted, perform LDAP action */
+ $this->usertab= new usertabs($this->config, $this->config->data['TABS']['USERTABS'],$dn);
+ $this->usertab->set_acl_base();
+ $this->usertab->delete ();
+ gosa_log ("User object '".$dn."' has been removed");
+ unset ($this->usertab);
+ $this->usertab= NULL;
+ } else {
+ print_red (sprintf(_("You are not allowed to delete the user '%s'!"),$dn));
+ if(isset($this->ui->uid)){
+ gosa_log ("Warning: '".$this->ui->uid."' tried to trick user deletion.");
+ }
+ }
+ /* Remove lock file after successfull deletion */
+ del_lock ($dn);
+ }
+ }
+
+
/********************
Delete entry requested, display confirm dialog
********************/
/* 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 user %s."), @LDAP::fix($this->dn)));
+ $smarty->assign("multiple", false);
return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
}
}
}
+
+ function list_get_selected_items()
+ {
+ $ids = array();
+ foreach($_POST as $name => $value){
+ if(preg_match("/^item_selected_[0-9]*$/",$name)){
+ $id = preg_replace("/^item_selected_/","",$name);
+ $ids[$id] = $id;
+ }
+ }
+ return($ids);
+ }
+
+
/* A set of disabled and therefore overloaded functions. They are
not needed in this class. */
function remove_from_parent() { }
index eae8d7f09179711a8d9506af5268a41ce06f12a1..eb78a09b344cce495988267827d908e46a26e7a0 100644 (file)
</p>
<p class="plugbottom">
+ {if $multiple}
+ <input type=submit name="delete_multiple_user_confirm" value="{t}Delete{/t}">
+ {else}
<input type=submit name="delete_user_confirm" value="{t}Delete{/t}">
+ {/if}
<input type=submit name="delete_cancel" value="{t}Cancel{/t}">
</p>