![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 5d56063f93f97678ea368f29b25f36599a3da63d..d11e22d654f7f57f63139e151413e461c0e37e69 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_users/");
$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_users",
"create_user_from_tpl" => "userfrom_tpl",
"change_pw" => "user_chgpw",
"editPaste" => "editPaste", "copy" => "copy",
$acl = $this->ui->get_permissions($dn, "users/password");
$cacl= $this->ui->get_permissions($dn, "users/user");
-
if (preg_match('/w/', $acl) || preg_match('/c/', $cacl)){
/* Check input and feed errors into 'message' */
}
+ /********************
+ 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->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 */
+ if (count($this->dns) == 1){
+ $smarty->assign("info", sprintf(_("You're about to delete the following entry: %s"), @LDAP::fix($dns_names)));
+ } else {
+ $smarty->assign("info", sprintf(_("You're about to delete the following 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_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);
+ unset($this->dns[$key]);
+ }
+ }
+
+
+ /********************
+ Delete MULTIPLE entries Canceled
+ ********************/
+
+ /* Remove lock */
+ if(isset($_POST['delete_multiple_user_cancel'])){
+ foreach($this->dns as $key => $dn){
+ del_lock ($dn);
+ unset($this->dns[$key]);
+ }
+ }
+
+
/********************
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)));
}
/* In case of new users, ask for a password, skip this for templates */
if (($set_pass || $this->usertab->password_change_needed()) && !$this->is_template){
+ $this->dn = $this->usertab->dn;
return($smarty->fetch(get_template_path('password.tpl', TRUE)));
}
/* Add departments if subsearch is disabled */
if(!$this->DivListUsers->SubSearch){
- $this->DivListUsers->AddDepartments($this->DivListUsers->selectedBase,4);
+ $this->DivListUsers->AddDepartments($this->DivListUsers->selectedBase,4,1);
}
$this->reload();
$this->DivListUsers->setEntries($this->list);
$SortTemp = array();
$List = array();
foreach($ListTemp as $Key => $Entry){
- // Generate caption for rows
- if (isset($Entry["sn"]) && isset($Entry["givenName"])){
- $display= $Entry["sn"][0].", ".$Entry["givenName"][0]." [".$Entry["uid"][0]."]";
- } else {
- $display= "[".$Entry["uid"][0]."]";
- }
- $display = strtolower($display);
- $List[$display] = $Entry;
- $SortTemp[$display] = $display;
+ /* Skip entries that are not located under the people ou (normaly 'ou=people,')
+ * Else winstations will be listed too, if you use the subtree flag.
+ */
+ if(!preg_match("/".normalizePreg(get_people_ou())."/i",$Entry['dn'])){
+ continue;
+ }else{
+
+ // Generate caption for rows
+ if (isset($Entry["sn"]) && isset($Entry["givenName"])){
+ $display= $Entry["sn"][0].", ".$Entry["givenName"][0]." [".$Entry["uid"][0]."]";
+ } else {
+ $display= "[".$Entry["uid"][0]."]";
+ }
+
+ $display = strtolower($display);
+ $List[$display] = $Entry;
+ $SortTemp[$display] = $display;
+ }
}
sort($SortTemp);
reset($SortTemp);
$dn= $this->list[trim($s_entry)]['dn'];
/* Check acl */
- $acl = $this->ui->get_permissions($dn,"users/user");
- if(preg_match("/(c.*w|w.*c)/",$acl)){
+ $ui = get_userinfo();
+ $acl_all = $ui->has_complete_category_acls($this->DivListUsers->selectedBase,"users") ;
+ if(preg_match("/(c.*w|w.*c)/",$acl_all)){
$obj = new usertabs($this->config, $this->config->data['TABS']['USERTABS'], $dn);
$obj->set_acl_base($dn);
$objNew = new usertabs($this->config, $this->config->data['TABS']['USERTABS'], "new");
$dn= $this->list[trim($s_entry)]['dn'];
/* Check acl */
- $acl = $this->ui->get_permissions($dn,"users/user");
- if(preg_match("/(c.*w|w.*c)/",$acl)){
+ $acl_all = $ui->has_complete_category_acls($this->DivListUsers->selectedBase,"users") ;
+ if(preg_match("/(c.*w|w.*c)/",$acl_all)){
$obj= new usertabs($this->config, $this->config->data['TABS']['USERTABS'], $dn);
$obj->set_acl_base($dn);
$this->CopyPasteHandler->Cut($obj);
}
}
+
+ 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() { }