X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fusers%2Fclass_userManagement.inc;h=7d2fd5cda6cd0ad5aa561c4c2d9f4ce0d2251b3f;hb=6e197560bc387121290d7e072f9936e8dd7092c1;hp=bf4b922ab47b4674d6ed92e231bb14066f1ea558;hpb=d0639ee1bc12a2412e5bc150d31564261e9ebf73;p=gosa.git diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc index bf4b922ab..7d2fd5cda 100644 --- a/plugins/admin/users/class_userManagement.inc +++ b/plugins/admin/users/class_userManagement.inc @@ -29,18 +29,17 @@ class userManagement extends plugin var $plDescription= "This does something"; /* Dialog attributes */ - var $usertab= NULL; - var $ui= NULL; - var $acl= ""; - var $templates= array(); - var $got_uid= false; - var $departments= array(); - var $CopyPasteHandler= NULL; - + var $usertab = NULL; + var $ui = NULL; + var $acl = ""; + var $templates = array(); + var $got_uid = false; + var $CopyPasteHandler = NULL; + var $CPPasswordChange = ""; // Contains the entry id which should get a new password + var $DivListUsers; function userManagement($config, $ui) { - /* Save configuration for internal use */ $this->config= $config; $this->ui= $ui; @@ -50,26 +49,8 @@ class userManagement extends plugin $this->CopyPasteHandler= new CopyPasteHandler($this->config); } - /* Get global filter config */ - if (!isset($_SESSION["userfilter"])){ - $base= get_base_from_people($ui->dn); - $userfilter= array( "mailusers" => "checked", - "unixusers" => "checked", - "templates" => "", - "subsearch" => "", - "proxyusers" => "checked", - "sambausers" => "checked", - "faxusers" => "checked", - "functionalusers" => "checked", - "regex" => "*"); - $_SESSION["userfilter"]= $userfilter; - } - - /* Transfer global base to dialogs people base */ - if(!isset($_SESSION['CurrentMainBase'])){ - $base= get_base_from_people($ui->dn); - $_SESSION['CurrentMainBase']= $base; - } + /* 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_/"); @@ -78,25 +59,12 @@ class userManagement extends plugin function execute() { - //FIXME: This function lacks structure! It's dammn spaghetti code. - /* Call parent execute */ plugin::execute(); - $smarty= get_smarty(); // Smarty instance - $userfilter= get_global("userfilter"); // contains Filter Settings - $s_action= ""; // Contains the action to be taken - $s_entry= ""; // The value for s_action - $base_back= ""; // The Link for Backbutton - - /* Department folder change requested? */ - if( isset($_GET['act']) && $_GET['act'] == "dep_open" ){ - $s_action= "open"; - $s_entry= base64_decode($_GET['dep_id']); - - /* Set current main base to the requested department DN */ - $_SESSION['CurrentMainBase']= $this->config->departments[trim($s_entry)]; - } + $smarty = get_smarty(); // Smarty instance + $s_action = ""; // Contains the action to be taken + $s_entry = ""; // The value for s_action /* Edit entry button pressed? */ if( isset($_GET['act']) && $_GET['act'] == "edit_entry" ){ @@ -109,10 +77,10 @@ class userManagement extends plugin /* Get every possible POST combination and set s_action/s_entry accordingly */ foreach(array("del" => "user_del", "edit" => "user_edit", - "back" => "dep_back", "new" => "user_new", - "home" => "dep_home", "new_tpl" => "user_tplnew", - "change_pw" => "user_chgpw", "root" => "dep_root", - "editpaste" => "editpaste", "copy" => "copy", + "new" => "user_new", + "new_tpl" => "user_tplnew", + "change_pw" => "user_chgpw", + "editPaste" => "editPaste", "copy" => "copy", "cut" => "cut") as $act => $name){ if (preg_match("/".$name.".*/", $key)){ @@ -135,163 +103,52 @@ class userManagement extends plugin $s_tab= "user"; } - /* Department has changed? */ - if(isset($_POST['CurrentMainBase'])){ - $_SESSION['CurrentMainBase']= validate($_POST['CurrentMainBase']); - } - - /* Home-button is pressed, move to users home DN */ - if($s_action == "home"){ - $_SESSION['CurrentMainBase']= preg_replace('/^[^,]+,'.normalizePreg(get_people_ou()).'/', "", $this->ui->dn); + /* Display the copy & paste dialog, if it is currently open */ + $ret = $this->copyPasteHandling($s_action,$s_entry); + if($ret){ + return($ret); } - /* Root-button is pressed, move to root DN */ - if($s_action == "root"){ - $_SESSION['CurrentMainBase']= $this->config->current['BASE']; - } - - /* If Back-button is pressed, move back one step in DN */ - if($s_action == "back"){ - //FIXME: This is not 100% correct. We'll only display ou's, but there may be - // a step between. You'll stumble in a "hidden" department in this case. - $base_back= preg_replace("/^[^,]+,/", "", $_SESSION['CurrentMainBase']); - - /* The department array keeps non DN entries as index. We need to convert - it before checking the existance. */ - $base_back= trim(convert_department_dn($base_back)); - - /* Check if the department exists, otherwise revert to the configure base DN */ - if(isset($this->config->departments[$base_back])){ - $_SESSION['CurrentMainBase']= $this->config->departments[$base_back]; - }else{ - $_SESSION['CurrentMainBase']= $this->config->departments['/']; - } - } -# |||| ----------------------- copy and paste - move it into a seperate function -//FIXME: I've mostly skipped reviewing this. Just a few comments have been -// added. Fact is, that we've an execute() function with more than 800 -// lines. I personally tend to make this shorter. Even the complete new -// list management is a huge copy'n paste factor which can be sourced out -// to another function. + /******************** + Edit existing entry + ********************/ - /* Only perform copy/paste if it is enabled */ - if($this->CopyPasteHandler){ + /* User wants to edit data? */ + if (($s_action=="edit") && (!isset($this->usertab->config))){ - /* Paste copied/cutted object in here */ - //FIXME: Sure? Does this comment describe what happens below? - if( $s_action == "editPaste" || $this->CopyPasteHandler->stillOpen()){ - $this->CopyPasteHandler->save_object(); - $this->CopyPasteHandler->SetVar("base", $_SESSION['CurrentMainBase']); - - /* Execute copy and paste without showing message on success. */ - //FIXME: It is not clear what really happens, or why we're stopping - // to process data here. See the FIXME in class_CopyAndPasteHandler. - // Normally we don't have something in $ret, because we've fired - // up with (false) <=> which seems to mean "no messages". - if( ($ret= $this->CopyPasteHandler->execute(false))){ - return ($ret); - } + /* Get 'dn' from posted 'uid', must be unique */ + $this->dn= $this->list[trim($s_entry)]['dn']; - /* Reload to have freshly copied entries in the list */ - $this->reload(); - - /* Use the last dn to search for it's ID in the newly generated list. */ - $dn= $this->CopyPasteHandler->lastdn; - foreach($this->list as $id => $entry){ - if($entry['dn'] == $dn){ - $s_entry= $id; - break; - } - } - - /* Change action to "change_pw" if user has requested to do so. */ - if($_POST['passwordTodo'] == "new"){ - $s_action= "change_pw"; - } + /* 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)); } - /* Copy current object to CopyHandler */ - if($s_action == "copy"){ - $this->CopyPasteHandler->Clear(); - - $dn= $this->list[trim($s_entry)]['dn']; - $acl= get_permissions ($dn, $this->ui->subtreeACL); + /* Lock the current entry, so everyone will get the + above dialog */ + add_lock ($this->dn, $this->ui->dn); - $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); - - foreach($obj->by_object as $name => $tab){ - foreach(array("photoData","jpegPhoto","is_account") as $attr){ - if(isset($obj->by_object[$name]->$attr)){ - $objNew->by_object[$name]->$attr = $obj->by_object[$name]->$attr; - } - } - } - $this->CopyPasteHandler->Copy($obj,$objNew); - } + /* Set up the users ACL's for this 'dn' */ + $acl= get_permissions ($this->dn, $this->ui->subtreeACL); - /* Copy current object to CopyHandler */ - //FIXME: Again? This is cut. Hopefully it works without touching the special - // attributes from above. - if($s_action == "cut"){ - $this->CopyPasteHandler->Clear(); - $dn= $this->list[trim($s_entry)]['dn']; - $acl= get_permissions ($dn, $this->ui->subtreeACL); + /* Register usertab to trigger edit dialog */ + $this->usertab= new usertabs($this->config, + $this->config->data['TABS']['USERTABS'], $this->dn); - $obj= new usertabs($this->config, $this->config->data['TABS']['USERTABS'], $dn); - $obj->set_acl($acl); + /* Switch tab, if it was requested by the user */ + $this->usertab->current = $s_tab; - $this->CopyPasteHandler->Cut($obj); - } - } -# ^^^^^ ----------------------- copy and paste - move it into a seperate function - - /* Save filter data if we are in the headpage */ - if(!isset($this->usertab)){ - $values= array("functionalusers", "unixusers", "mailusers", "sambausers", - "proxyusers", "faxusers", "templates", "subsearch"); - $userfilter= saveFilter($userfilter, $values); - register_global("userfilter", $userfilter); + /* Set ACL and move DN to the headline */ + $this->usertab->set_acl($acl); + $_SESSION['objectinfo']= $this->dn; } - /* React on user interaction here */ - if (($_SERVER["REQUEST_METHOD"] == "POST")||($_SERVER["REQUEST_METHOD"]== "GET")){ - - /* User wants to edit data? */ - if (($s_action=="edit") && (!isset($this->usertab->config))){ - /* Get 'dn' from posted 'uid', must be unique */ - $this->dn= $this->list[trim($s_entry)]['dn']; - - /* 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 everyone will get the - 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); - - /* Switch tab, in case that was requested by the user */ - $this->usertab->current = $s_tab; - - /* Set ACL and move DN to the headline */ - $this->usertab->set_acl($acl); - $_SESSION['objectinfo']= $this->dn; - } - } + /******************** + Edit canceled + ********************/ /* Reset all relevant data, if we get a _cancel request */ if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){ @@ -307,8 +164,18 @@ class userManagement extends plugin unset ($_SESSION['objectinfo']); } + + /******************** + Change password requested + ********************/ + /* Password change requested */ - if ($s_action == "change_pw"){ + if (($s_action == "change_pw") || (!empty($this->CPPasswordChange))){ + + if(!empty($this->CPPasswordChange)){ + $s_entry = $this->CPPasswordChange; + $this->CPPasswordChange = ""; + } /* Get 'dn' from posted 'uid' */ $this->dn= $this->list[trim($s_entry)]['dn']; @@ -331,6 +198,11 @@ class userManagement extends plugin } } + + /******************** + Change password confirmed + ********************/ + /* Perform password change */ if (isset($_POST['password_finish'])){ @@ -364,9 +236,11 @@ class userManagement extends plugin $config= $this->config; $ldap_ui= $this->config->get_ldap_link(); if(isset($this->usertab->dn)){ - $user = ($ldap_ui->fetch($ldap_ui->cat($this->usertab->dn))); + $ldap_ui->cat($this->usertab->dn,array("uid")); + $user = $ldap_ui->fetch(); }else{ - $user = ($ldap_ui->fetch($ldap_ui->cat($this->dn))); + $ldap_ui->cat($this->dn,array("uid")); + $user = $ldap_ui->fetch(); } if((is_array($user))&&(isset($user['uid']))){ $username= $user['uid'][0]; @@ -376,8 +250,7 @@ class userManagement extends plugin if ($this->usertab){ if ($this->usertab->password_change_needed()){ $obj= $this->usertab->by_object['user']; - change_password ($this->usertab->dn, $_POST['new_password'], - 0, $obj->pw_storage); + change_password ($this->usertab->dn, $_POST['new_password'],0, $obj->pw_storage); if (isset($config->data['MAIN']['EXTERNALPWDHOOK'])){ exec($config->data['MAIN']['EXTERNALPWDHOOK']." ".$username." ".$_POST['new_password'], $resarr); } @@ -402,7 +275,6 @@ class userManagement extends plugin /* Clean session, delete lock */ del_lock ($this->dn); - $this->reload(); unset ($this->usertab); $this->usertab= NULL; $this->lognames= array();; @@ -412,6 +284,11 @@ class userManagement extends plugin unset ($_SESSION['objectinfo']); } + + /******************** + Delete entry requested, display confirm dialog + ********************/ + /* Remove user was requested */ if ($s_action=="del"){ @@ -442,6 +319,11 @@ class userManagement extends plugin } } + + /******************** + Delete entry confirmed + ********************/ + /* Confirmation for deletion has been passed. User should be deleted. */ if (isset($_POST['delete_user_confirm'])){ @@ -450,16 +332,12 @@ class userManagement extends plugin if (chkacl($this->acl, "delete") == ""){ /* Delete request is permitted, perform LDAP action */ - $this->usertab= new usertabs($this->config, $this->config->data['TABS']['USERTABS'], - $this->dn); + $this->usertab= new usertabs($this->config, $this->config->data['TABS']['USERTABS'],$this->dn); $this->usertab->set_acl(array($this->acl)); $this->usertab->delete (); gosa_log ("User object '".$this->dn."' has been removed"); unset ($this->usertab); $this->usertab= NULL; - - /* User list has changed, reload it. */ - $this->reload (); } else { /* Normally this shouldn't be reached, send some extra @@ -475,6 +353,10 @@ class userManagement extends plugin del_lock ($this->dn); } + + /******************** + Delete entry Canceled + ********************/ /* Delete user canceled? */ if (isset($_POST['delete_cancel'])){ @@ -482,6 +364,10 @@ class userManagement extends plugin } + /******************** + Edit entry finished (Save) + ********************/ + /* Finish user edit is triggered by the tabulator dialog, so the user wants to save edited data. Check and save at this point. */ @@ -511,26 +397,19 @@ class userManagement extends plugin } gosa_log ("User object '".$this->dn."' has been saved"); - /* User has been saved successfully, remove lock from - LDAP. */ + /* 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 */ - if (($set_pass || $this->usertab->password_change_needed()) && - !$this->is_template){ - + /* 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))); } - /* There's no page reload so we have to read new users at - this point. */ - $this->reload (); 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. */ @@ -538,14 +417,18 @@ class userManagement extends plugin } } + + /******************** + We want to create a new user, so fetch all available user templates + ********************/ + /* Generate template list */ if (($s_action=="new")||($s_action=="create_user_from_tpl")){ $this->templates= array(); - $ldap= $this->config->get_ldap_link(); - /* Create list of tempaltes */ + /* Create list of templates */ foreach ($this->config->departments as $key => $value){ /* Get acls from different ou's */ @@ -575,6 +458,11 @@ class userManagement extends plugin reset ($this->templates); } + + /******************** + Create a new user,template, user from template + ********************/ + /* 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 @@ -587,10 +475,9 @@ class userManagement extends plugin } /* Create new usertab object */ - $this->usertab= new usertabs($this->config, - $this->config->data['TABS']['USERTABS'], $this->dn); + $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= $_SESSION['CurrentMainBase']; + $this->usertab->by_object['user']->base= $this->DivListUsers->selectedBase; /* Take care about templates */ if ($s_action=="new_tpl"){ @@ -615,10 +502,14 @@ class userManagement extends plugin } } + /******************** + Template selected continue edit + ********************/ + /* Continue template editing */ if ((isset($_POST['template_continue']) && $_POST['template'] != 'none' && !isset($_POST['uid']))){ - $this->sn= $_POST['sn']; - $this->givenName= $_POST['givenName']; + $this->sn = $_POST['sn']; + $this->givenName = $_POST['givenName']; /* Check for requred values */ $message= array(); @@ -667,6 +558,11 @@ class userManagement extends plugin return($smarty->fetch(get_template_path('template.tpl', TRUE))); } + + /******************** + No template selected continue edit + ********************/ + /* No template. Ok. Lets fill data into the normal user dialog */ if (isset($_POST['template_continue']) && $_POST['template'] == 'none'){ foreach(array("sn", "givenName", "uid") as $attr){ @@ -676,6 +572,11 @@ class userManagement extends plugin } } + + /******************** + Template selected continue edit + ********************/ + /* Finish template preamble */ if (isset($_POST['template_continue']) && $_POST['template'] != 'none' && (isset($_POST['uid']))){ @@ -697,11 +598,21 @@ class userManagement extends plugin $acl= get_permissions ($template_base, $this->ui->subtreeACL); $this->usertab->set_acl($acl); } - + + + /******************** + If no template was selected set base + ********************/ + if (isset($_POST['template_continue']) && ($_POST['template'] == 'none')){ - $this->usertab->by_object['user']->base= $_SESSION['CurrentMainBase']; + $this->usertab->by_object['user']->base= $this->DivListUsers->selectedBase; } + + /******************** + Display subdialog + ********************/ + /* Show tab dialog if object is present */ if(isset($this->usertab->config)){ $display= $this->usertab->execute(); @@ -716,340 +627,37 @@ class userManagement extends plugin } return ($display); } - - /* Reload if we need a reload... */ - if (!isset($this->usertab) && - !isset($_POST['new_user']) && - !isset($_POST['new_template']) && - !isset($_POST['delete_user']) && - !isset($_POST['setpass_user']) && - !isset($_POST['select_user'])){ - $this->reload(); - } - - /* Check for exeeded sizelimit */ - if (($message= check_sizelimit()) != ""){ - return($message); - } - - /* Prepare departments */ - $options= ""; - foreach ($this->config->idepartments as $key => $value){ - if ($_SESSION['CurrentMainBase'] == $key){ - $options.= ""; - } else { - $options.= ""; - } - } - - /* Choose correct paste icon */ - if($this->CopyPasteHandler){ - $Copy_Paste= $this->CopyPasteHandler->generatePasteIcon(); - }else{ - $Copy_Paste= ""; - } - -#------------------------------------------------------------------------ Review mark - //FIXME: Hmm. I spent some hours in the past to get rid of HTML inside the - // PHP code. The section from here until the end of the execute() function - // is not what I'd call a good solution. It works, but its somewhat ugly. - // Currently I've no idea to make it better. HERE docs can help to make - // the code more readable. Smarty templates would be the best solution. - // Just not sure how to do it right now. - - /* NEW LIST MANAGMENT */ - //FIXME: Who cares? The old one is not present, and the big letters don't - // make clear that it's still spaghetti code... - //FIXME: Variable naming - field1.... - $listhead = "