![[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 7d2fd5cda6cd0ad5aa561c4c2d9f4ce0d2251b3f..c0042797a60a184c1b8ec58f9e99d9cff82d85f2 100644 (file)
/* Dialog attributes */
var $usertab = NULL;
var $ui = NULL;
- var $acl = "";
var $templates = array();
var $got_uid = false;
var $CopyPasteHandler = NULL;
/* Creat dialog object */
$this->DivListUsers = new divListUsers($this->config,$this);
- /* LOCK MESSAGE Vars */
- $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^user_edit_/","/^user_del_/");
}
/* Call parent execute */
plugin::execute();
+ /* LOCK MESSAGE Vars */
+ $_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^user_edit_/","/^user_del_/");
+
$smarty = get_smarty(); // Smarty instance
$s_action = ""; // Contains the action to be taken
$s_entry = ""; // The value for s_action
foreach(array("del" => "user_del", "edit" => "user_edit",
"new" => "user_new",
"new_tpl" => "user_tplnew",
+ "create_user_from_tpl" => "userfrom_tpl",
"change_pw" => "user_chgpw",
"editPaste" => "editPaste", "copy" => "copy",
"cut" => "cut") as $act => $name){
$s_tab= "user";
}
+ if(!search_config($this->config->data['TABS'], $s_tab , "CLASS")){
+ $s_tab = "user";
+ }
+
/* Display the copy & paste dialog, if it is currently open */
$ret = $this->copyPasteHandling($s_action,$s_entry);
if($ret){
above dialog */
add_lock ($this->dn, $this->ui->dn);
- /* Set up the users ACL's for this 'dn' */
- $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-
/* Register usertab to trigger edit dialog */
$this->usertab= new usertabs($this->config,
$this->config->data['TABS']['USERTABS'], $this->dn);
$this->usertab->current = $s_tab;
/* Set ACL and move DN to the headline */
- $this->usertab->set_acl($acl);
+ $this->usertab->set_acl_base($this->dn);
$_SESSION['objectinfo']= $this->dn;
}
/* Load permissions for selected 'dn' and check if
we're allowed to remove this 'dn' */
- $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
- $acl= get_module_permission($acl, "user", $this->dn);
- if (chkacl($acl, "password") == ""){
+ if (preg_match("/w/",$this->ui->get_permissions($this->dn,"users/password"))){
/* User is allowed to change passwords, save 'dn' and 'acl' for next
dialog. */
- $this->acl= $acl;
$_SESSION['objectinfo']= $this->dn;
return ($smarty->fetch(get_template_path('password.tpl', TRUE)));
if (isset($_POST['password_finish'])){
/* For security reasons, check if user is allowed to set password again */
- if (chkacl($this->acl, "password") == "" || chkacl($this->acl, "create")){
+ $dn = $this->dn;
+ $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' */
$message= array();
/* Missing permissions, show message */
print_red (_("You are not allowed to set this users password!"));
}
-
/* Clean session, delete lock */
del_lock ($this->dn);
unset ($this->usertab);
/* Load permissions for selected 'dn' and check if
we're allowed to remove this 'dn' */
- $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
- $this->acl= get_module_permission($acl, "user", $this->dn);
- if (chkacl($this->acl, "delete") == ""){
-
- /* Check locking, save current plugin in 'back_plugin', so
- the dialog knows where to return. */
- if (($user= get_lock($this->dn)) != ""){
- return(gen_locked_message ($user, $this->dn));
- }
-
- /* 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)));
- return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
- } else {
- /* Obviously the user isn't allowed to delete. Show message and
- clean session. */
- print_red (_("You are not allowed to delete this user!"));
+ /* Check locking, save current plugin in 'back_plugin', so
+ the dialog knows where to return. */
+ if (($user= get_lock($this->dn)) != ""){
+ return(gen_locked_message ($user, $this->dn));
}
+
+ /* 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)));
+ return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
}
/* Some nice guy may send this as POST, so we've to check
for the permissions again. */
- if (chkacl($this->acl, "delete") == ""){
+
+ $acl = $this->ui->get_permissions($this->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'],$this->dn);
- $this->usertab->set_acl(array($this->acl));
+ $this->usertab->set_acl_base();
$this->usertab->delete ();
gosa_log ("User object '".$this->dn."' has been removed");
unset ($this->usertab);
/* Finish user edit is triggered by the tabulator dialog, so
the user wants to save edited data. Check and save at this
point. */
- if ((isset($_POST['edit_finish'])) && (isset($this->usertab->config))){
+ if ((isset($_POST['edit_finish']) || isset($_POST['edit_apply'])) && (isset($this->usertab->config))){
/* Check tabs, will feed message array */
$this->usertab->last= $this->usertab->current;
}
gosa_log ("User object '".$this->dn."' has been saved");
- /* User has been saved successfully, remove lock from LDAP. */
- if ($this->dn != "new"){
- del_lock ($this->dn);
- }
+ if (!isset($_POST['edit_apply'])){
+ /* User has been saved successfully, remove lock from LDAP. */
+ if ($this->dn != "new"){
+ del_lock ($this->dn);
+ }
- /* In case of new users, ask for a password, skip this for templates */
- if (($set_pass || $this->usertab->password_change_needed()) && !$this->is_template){
- return($smarty->fetch(get_template_path('password.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)));
+ }
- unset ($this->usertab);
- $this->usertab= NULL;
- unset ($_SESSION['objectinfo']);
+ unset ($this->usertab);
+ $this->usertab= NULL;
+ unset ($_SESSION['objectinfo']);
+ }
} else {
/* Ok. There seem to be errors regarding to the tab data,
show message and continue as usual. */
foreach ($this->config->departments as $key => $value){
/* Get acls from different ou's */
- $acl= get_permissions (get_people_ou().$value, $this->ui->subtreeACL);
- $acl= get_module_permission($acl, "user", get_people_ou().$value);
-
+ $acl = $this->ui->get_permissions("cn=dummy,".get_people_ou().$value,"users/user") ;
+
/* If creation of a new user is allowed, append this template */
- if (chkacl($acl, "create") == ""){
+ if (preg_match("/c/",$acl)){
/* Search all templates from the current dn */
$ldap->cd (get_people_ou().$value);
Create a new user,template, user from template
********************/
+ /* Check selected options for template */
+ if (isset($_POST['template_continue'])){
+ $message = array();
+ if(!isset($_POST['template']) || (empty($_POST['template']))){
+ $message[] = _("Please select a valid template.");
+ }
+ if(!isset($_POST['sn']) || (empty($_POST['sn']))){
+ $message[]= _("The required field 'Name' is not set.");
+ }
+ if(!isset($_POST['givenName']) || (empty($_POST['givenName']))){
+ $message[]= _("The required field 'Given name' is not set.");
+ }
+
+ /* Show error message / continue editing */
+ if (count($message) > 0){
+ show_errors ($message);
+
+ foreach(array("sn", "givenName", "uid", "template") as $attr){
+ if(isset($_POST[$attr])){
+ $smarty->assign("$attr", $_POST[$attr]);
+ }else{
+ $smarty->assign("$attr", "");
+ }
+ }
+ $smarty->assign("templates",$this->templates);
+ $smarty->assign("got_uid",$this->got_uid);
+ $smarty->assign("edit_uid",false);
+ return($smarty->fetch(get_template_path('template.tpl', TRUE)));
+
+ }
+ }
+
/* New user/template request */
if (($s_action=="create_user_from_tpl")||($s_action=="new") || ($s_action=="new_tpl")){
/* By default we set 'dn' to 'new', all relevant plugins will
react on this. */
$this->dn= "new";
+
if (isset($this->config->current['IDGEN'])){
$this->got_uid= false;
} else {
/* Create new usertab object */
$this->usertab= new usertabs($this->config,$this->config->data['TABS']['USERTABS'], $this->dn);
- $this->usertab->set_acl(array(':all'));
$this->usertab->by_object['user']->base= $this->DivListUsers->selectedBase;
+ $this->usertab->set_acl_base('dummy,'.$this->DivListUsers->selectedBase);
/* Take care about templates */
if ($s_action=="new_tpl"){
********************/
/* Continue template editing */
- if ((isset($_POST['template_continue']) && $_POST['template'] != 'none' && !isset($_POST['uid']))){
+ if ((isset($_POST['template_continue'])) && ($_POST['template'] != 'none') && (!isset($_POST['uid']))){
+
$this->sn = $_POST['sn'];
$this->givenName = $_POST['givenName'];
return($smarty->fetch(get_template_path('template.tpl', TRUE)));
}
-
/********************
No template selected continue edit
********************/
$this->usertab->adapt_from_template($template_dn);
$template_base = preg_replace("/^[^,]+,".normalizePreg(get_people_ou())."/", '', $template_dn);
$this->usertab->by_object['user']->base= $template_base;
-
- /* Set up the users ACL's for this 'dn' */
- $acl= get_permissions ($template_base, $this->ui->subtreeACL);
- $this->usertab->set_acl($acl);
}
$display= $this->usertab->execute();
/* Don't show buttons if tab dialog requests this */
- if (!$this->usertab->by_object[$this->usertab->current]->dialog){
- $display.= "<p style=\"text-align:right\">\n";
- $display.= "<input type=submit name=\"edit_finish\" value=\""._("Save")."\">\n";
- $display.= " \n";
- $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
- $display.= "</p>";
+ if(isset($this->usertab->by_object)){
+ if (!$this->usertab->by_object[$this->usertab->current]->dialog){
+ $display.= "<p style=\"text-align:right\">\n";
+ $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
+ $display.= " \n";
+ if ($this->dn != "new"){
+ $display.= "<input type=submit name=\"edit_apply\" value=\""._("Apply")."\">\n";
+ $display.= " \n";
+ }
+ $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
+ $display.= "</p>";
+ }
}
return ($display);
}
-
+
+ /* Check if there is a snapshot dialog open */
+ $base = $this->DivListUsers->selectedBase;
+ if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases())){
+ return($str);
+ }
+
/* Return rendered main page */
/* Display dialog with system list */
$this->DivListUsers->parent = $this;
}
+ /* Return departments, that will be included within snapshot detection */
+ function get_used_snapshot_bases()
+ {
+ return(array(get_people_ou().$this->DivListUsers->selectedBase));
+ }
+
+
function reload()
{
/* Set base for all searches */
/* Generate userlist */
$ldap= $this->config->get_ldap_link(TRUE);
+
if ($SubSearch){
- $ListTemp = get_list($filter, $this->ui->subtreeACL, $base,
+ $ListTemp = get_list($filter, "users", $base,
array("uid", "givenName", "sn", "objectClass"), GL_SUBSEARCH | GL_SIZELIMIT);
} else {
$base= get_people_ou().$base;
- $ListTemp = get_list($filter, $this->ui->subtreeACL, $base,
+ $ListTemp = get_list($filter, "users", $base,
array("uid", "givenName", "sn", "objectClass"), GL_SIZELIMIT);
}
$SortTemp = array();
+ $List = array();
foreach($ListTemp as $Key => $Entry){
// Generate caption for rows
if (isset($Entry["sn"]) && isset($Entry["givenName"])){
$display= "[".$Entry["uid"][0]."]";
}
- $SortTemp[$Key] = $display;
+ $display = strtolower($display);
+ $List[$display] = $Entry;
+ $SortTemp[$display] = $display;
}
- natcasesort($SortTemp);
+ sort($SortTemp);
reset($SortTemp);
- foreach($SortTemp as $Key => $Value){
- $this->list[] = $ListTemp[$Key];
+
+ $this->list = array();
+ foreach($SortTemp as $Key){
+ $this->list[] = $List[$Key];
}
}
/* Use the last dn to search for it's ID in the newly generated list. */
$dn= $this->CopyPasteHandler->lastdn;
+
+ /* Get new user list */
+ $this->reload();
foreach($this->list as $id => $entry){
if($entry['dn'] == $dn){
$s_entry= $id;
}
/* Copy selected object
- Create a new empty object and the current selected object.
- Send both to copy&paste class*/
+ Create a new empty object and the current selected object.
+ Send both to copy&paste class*/
if($s_action == "copy"){
$this->CopyPasteHandler->Clear();
$dn= $this->list[trim($s_entry)]['dn'];
- $acl= get_permissions ($dn, $this->ui->subtreeACL);
- $obj = new usertabs($this->config, $this->config->data['TABS']['USERTABS'], $dn);
- $objNew = new usertabs($this->config, $this->config->data['TABS']['USERTABS'], "new");
- $obj-> set_acl($acl);
- $objNew-> set_acl($acl);
- $this->CopyPasteHandler->Copy($obj,$objNew);
+
+ /* Check acl */
+ $acl_all = $ui->has_complete_category_acls($this->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");
+ $objNew->set_acl_base($dn);
+
+ $this->CopyPasteHandler->Copy($obj,$objNew);
+ }else{
+ print_red("You are not allowed to copy this entry.");
+ }
}
/* Cut selected object.
- Open user object and send it to the copy & paste handler */
+ Open user object and send it to the copy & paste handler */
if($s_action == "cut"){
$this->CopyPasteHandler->Clear();
$dn= $this->list[trim($s_entry)]['dn'];
- $acl= get_permissions ($dn, $this->ui->subtreeACL);
- $obj= new usertabs($this->config, $this->config->data['TABS']['USERTABS'], $dn);
- $obj->set_acl($acl);
- $this->CopyPasteHandler->Cut($obj);
+
+ /* Check acl */
+ $acl_all = $ui->has_complete_category_acls($this->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);
+ }else{
+ print_red("You are not allowed to cut this entry.");
+ }
}
}
}
function save_object()
{
/* Handle divlist filter && department selection*/
- $this->DivListUsers->save_object();
+ if(!is_object($this->usertab)){
+ $this->DivListUsers->save_object();
+ }
}
/* A set of disabled and therefore overloaded functions. They are
function save() { }
function adapt_from_template($dn) { }
function password_change_needed() { }
- function show_header($button_text, $text, $disabled= FALSE) { }
} /* ... class userManagement */
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: