![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a989bbf)
raw | patch | inline | side by side (parent: a989bbf)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Mon, 26 Oct 2009 10:02:05 +0000 (10:02 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Mon, 26 Oct 2009 10:02:05 +0000 (10:02 +0000) |
-Reduced to a single page. Testing!
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14630 594d385d-05f5-0310-b6e9-bd551577e9d8
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14630 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 3e99ac0a81b7d48edb77a2cd1dc7d4ceb38eb13f..511ac7aa8bedeebc9b7cf4319945a336c96d19c5 100644 (file)
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-class userManagement extends plugin
+class userManagement extends management
{
- /* Plugin definitions */
var $plHeadline = "Users";
var $plDescription = "Manage users";
- var $plIcon = "plugins/users/images/user.png";
+ var $plIcon = "plugins/users/images/user.png";
- /* Dialog attributes */
- var $usertab = NULL;
- var $ui = NULL;
- var $templates = array();
- var $got_uid = false;
- var $CopyPasteHandler = NULL;
- var $SnapshotHandler = NULL;
- var $CPPasswordChange = ""; // Contains the entry id which should get a new password
- var $DivListUsers;
+ // Tab definition
+ protected $tabClass = "usertabs";
+ protected $tabType = "USERTABS";
+ protected $aclCategory = "users";
+ protected $aclPlugin = "user";
+ protected $objectName = "user";
- var $pwd_change_queue = array();
-
- var $start_pasting_copied_objects = FALSE;
- var $msg_dialog= NULL;
- var $acl_module = array("users");
- var $dns = array();
-
- // Filter/headpage tests
- var $filter= null;
- var $headpage= null;
-
-
- function userManagement(&$config, $ui)
- {
- /* Save configuration for internal use */
- $this->config= &$config;
- $this->ui= &$ui;
-
- /* Copy & Paste handler */
- if ($this->config->boolValueIsTrue("main", "copyPaste")){
- $this->CopyPasteHandler= new CopyPasteHandler($this->config);
- }
- if($this->config->get_cfg_value("enableSnapshots") == "true"){
- $this->SnapshotHandler= new SnapshotHandler($this->config);
- }
-
- /* Creat dialog object */
- $this->DivListUsers = new divListUsers($this->config,$this);
-
- }
-
-
- function execute()
- {
- /* Call parent execute */
- plugin::execute();
-
- /* LOCK MESSAGE Vars */
- session::set('LOCK_VARS_TO_USE',array("/^act$/","/^id$/","/^user_edit_/","/^user_del_/","/^item_selected/","/^remove_multiple_users/","/^multiple_edit/","/menu_action/"));
-
- $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" ){
- $s_action= "edit";
- $s_entry= validate($_GET['id']);
- }
-
- /* Test relevant POST values */
- foreach($_POST as $key => $val){
-
- /* Get every possible POST combination and set s_action/s_entry accordingly */
- 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_multiple" => "multiple_copy_users",
- "multiple_edit" => "multiple_edit",
- "cut_multiple" => "multiple_cut_users",
- "multiple_password_change" => "multiple_password_change",
- "copy" => "^copy",
- "toggle_lock_status" => "toggle_lock_status",
- "cut" => "^cut") as $act => $name){
-
- if (preg_match("/".$name.".*/", $key)){
- $s_action= $act;
- $s_entry= preg_replace("/".$name."_/i", "", $key);
- break;
- }
- }
-
- } /* ...Test POST */
-
- /* Remove coordinate prefix from POST, required by some browsers */
- $s_entry= preg_replace("/_.$/", "", $s_entry);
-
- /* Seperate possibly encoded tab and entry, default to tab "user" */
- if(preg_match("/.*-.*/", $s_entry)){
- $s_tab= preg_replace("/^[^-]*-/i", "" ,$s_entry);
- $s_entry= preg_replace("/-[^-]*$/i", "", $s_entry);
- }else{
- $s_tab= "user";
- }
-
- if(!$this->config->search($s_tab, 'class',array('tabs'))){
- $s_tab = "user";
- }
-
- if (isset($_POST['menu_action'])){
-
- /* handle C&P from layers menu */
- if(preg_match("/^multiple_copy_systems/",$_POST['menu_action'])){
- $s_action = "copy_multiple";
- }
- if(preg_match("/^multiple_cut_systems/",$_POST['menu_action'])){
- $s_action = "cut_multiple";
- }
- if(preg_match("/^editPaste/",$_POST['menu_action'])){
- $s_action = "editPaste";
- }
-
- /* Create options */
- if($_POST['menu_action'] == "user_new"){
- $s_action = "new";
- }
- if($_POST['menu_action'] == "user_tplnew"){
- $s_action = "new_tpl";
- }
- if($_POST['menu_action'] == "multiple_edit"){
- $s_action = "multiple_edit";
- }
-
- /* handle remove from layers menu */
- if(preg_match("/^multiple_password_change/",$_POST['menu_action'])){
- $s_action = "multiple_password_change";
- }
-
- /* handle remove from layers menu */
- if(preg_match("/^remove_multiple/",$_POST['menu_action'])){
- $s_action = "del_multiple";
- }
- if(preg_match("/^templatize_multiple/",$_POST['menu_action'])){
- $s_action = "templatize_multiple";
- }
-
- if(preg_match("/^event/",$_POST['menu_action'])){
- $s_action = $_POST['menu_action'];
- }
- }
-
- /* Use template */
- if(isset($_POST['templatize_continue'])){
- $s_action = "templatize_continue";
- }
-
-
- /********************
- Create notification event
- ********************/
-
- if(preg_match("/^event_/",$s_action) && class_available("DaemonEvent")){
- $ids = $this->list_get_selected_items();
- $uids = array();
- foreach($ids as $id){
- $uids[] = $this->list[$id]['uid'][0];
- }
- if(count($uids)){
- $events = DaemonEvent::get_event_types(USER_EVENT);
- $event = preg_replace("/^event_/","",$s_action);
- if(isset($events['BY_CLASS'][$event])){
- $type = $events['BY_CLASS'][$event];
- $this->usertab = new $type['CLASS_NAME']($this->config);
- $this->usertab->add_users($uids);
- $this->usertab->set_type(SCHEDULED_EVENT);
- }
- }
- }
-
- /* Abort event dialog */
- if(isset($_POST['abort_event_dialog'])){
- $this->usertab = FALSE;
- }
-
- /* Save event */
- if(isset($_POST['save_event_dialog'])){
- $this->usertab->save_object();
- $msgs = $this->usertab->check();
- if(count($msgs)){
- msg_dialog::displayChecks($msgs);
- }else{
-
- $o_queue = new gosaSupportDaemon();
- $o_queue->append($this->usertab);
- if($o_queue->is_error()){
- msg_dialog::display(_("Infrastructure error"), msgPool::siError($o_queue->get_error()),ERROR_DIALOG);
- }else{
- $this->usertab = FALSE;
- }
- }
- }
-
- /* Display event */
- if($this->usertab instanceof DaemonEvent){
- $this->usertab->save_object();
- return($this->usertab->execute());
- }
-
-
- /********************
- Copy & Paste
- ********************/
-
- /* Display the copy & paste dialog, if it is currently open */
- if($this->CPPasswordChange == ""){
- $ret = $this->copyPasteHandling_from_queue($s_action,$s_entry);
- if($ret){
- return($ret);
- }
- }
-
-
- /********************
- Change password confirmed
- ********************/
-
- /* Perform password change */
- if (isset($_POST['password_finish'])){
-
- /* For security reasons, check if user is allowed to set password again */
- $dn = $this->dn;
- $acl = $this->ui->get_permissions($dn, "users/password");
- $cacl= $this->ui->get_permissions($dn, "users/user");
-
- /* Are we allowed to create a new user or to set the password attribute? */
- if (preg_match('/w/', $acl) || preg_match('/c/', $cacl)){
-
- /* Check input and feed errors into 'message' */
- $message= array();
-
- /* Sanity checks... */
- if ($_POST['new_password'] != $_POST['repeated_password']){
-
- /* Matching passwords in new and repeated? */
- $message[]= _("The passwords you've entered as 'New password' and 'Repeated new password' do not match.");
- } else {
-
- /* Empty password is not permitted by default. */
- if ($_POST['new_password'] == ""){
- msgPool::required(_("New password"));
- }
- }
-
- /* Errors, or password change? */
- if (count($message) != 0){
-
- /* Show error message and continue editing */
- msg_dialog::displayChecks($message);
- return($smarty->fetch(get_template_path('password.tpl', TRUE)));
- }
-
- $config= $this->config;
- $ldap_ui= $this->config->get_ldap_link();
- if(isset($this->usertab->dn)){
- $ldap_ui->cat($this->usertab->dn,array("uid"));
- $user = $ldap_ui->fetch();
- }else{
- $ldap_ui->cat($this->dn,array("uid"));
- $user = $ldap_ui->fetch();
- }
- if((is_array($user))&&(isset($user['uid']))){
- $username= $user['uid'][0];
- }
-
- /* Set password, perform required steps */
- if ($this->usertab){
- if ($this->usertab->password_change_needed()){
- $obj= $this->usertab->by_object['user'];
- if(!change_password ($this->usertab->dn, $_POST['new_password'],0, $obj->pw_storage)){
- return($smarty->fetch(get_template_path('password.tpl', TRUE)));
- }
- if ($config->get_cfg_value("passwordHook") != ""){
- exec($config->get_cfg_value("passwordHook")." ".$username." ".$_POST['new_password'], $resarr);
- }
- new log("modify","users/".get_class($this),$this->usertab->dn,array(),"Password has been changed");
- unset($this->usertab);
- $this->usertab= NULL;
- }
- } else {
- if(!change_password ($this->dn, $_POST['new_password'])){
- return($smarty->fetch(get_template_path('password.tpl', TRUE)));
- }
- if ($config->get_cfg_value("passwordHook") != ""){
- exec($config->get_cfg_value("passwordHook")." ".$username." ".$_POST['new_password'], $resarr);
- }
- new log("modify","users/".get_class($this),$this->dn,array(),"Password has been changed");
- }
- } else {
-
- /* Missing permissions, show message */
- msg_dialog::display(_("Password change"),_("You have no permission to change this users password!"),WARNING_DIALOG);
- }
- /* Clean session, delete lock */
- $this->remove_lock();
- unset ($this->usertab);
- $this->usertab= NULL;
- $this->lognames= array();;
- $this->sn= "";
- $this->givenName= "";
- $this->uid= "";
- set_object_info();
- }
-
-
- /********************
- Change multiple passwords requested
- ********************/
-
- if($s_action == "multiple_password_change"){
- $this->pwd_change_queue = $this->list_get_selected_items();
- $disallowed = array();
- foreach($this->pwd_change_queue as $key => $id){
- if(!preg_match("/w/",$this->ui->get_permissions($this->list[trim($id)]['dn'],"users/password"))){
- unset($this->pwd_change_queue[$key]);
- $disallowed[] = $this->list[trim($id)]['dn'];
- }
- }
- if(count($disallowed)){
- msg_dialog::display(_("Permission"),msgPool::permModify($disallowed),INFO_DIALOG);
- }
- }
-
-
- /********************
- Change password requested
- ********************/
-
- /* Password change requested */
- if (($s_action == "change_pw") || (!empty($this->CPPasswordChange)) || count($this->pwd_change_queue)){
-
- /* Get users whose passwords should be changed. */
- if(count($this->pwd_change_queue)){
- $s_entry= array_pop($this->pwd_change_queue);
- }
-
- if(!empty($this->CPPasswordChange)){
- $s_entry = $this->CPPasswordChange;
- $this->CPPasswordChange = "";
- }
-
- /* Get 'dn' from posted 'uid' */
- $this->dn= $this->list[trim($s_entry)]['dn'];
-
- /* Load permissions for selected 'dn' and check if
- we're allowed to remove this 'dn' */
- 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. */
- set_object_info($this->dn);
- return ($smarty->fetch(get_template_path('password.tpl', TRUE)));
- } else {
- /* User is not allowed. Show message and cancel. */
- msg_dialog::display(_("Password change"),_("You have no permission to change this users password!"),WARNING_DIALOG);
- }
- }
-
-
-
- /********************
- Edit existing entry
- ********************/
-
-
- /* 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,TRUE));
- }
-
- /* Lock the current entry, so everyone will get the
- above dialog */
- add_lock ($this->dn, $this->ui->dn);
-
- /* Register usertab to trigger edit dialog */
- $this->usertab= new usertabs($this->config,
- $this->config->data['TABS']['USERTABS'], $this->dn);
-
- /* Switch tab, if it was requested by the user */
- $this->usertab->current = $s_tab;
-
- /* Set ACL and move DN to the headline */
- $this->usertab->set_acl_base($this->dn);
- set_object_info($this->dn);
- }
-
-
- /********************
- Edit multiple entries
- ********************/
-
- /* User wants to edit data? */
- if ($s_action == "multiple_edit" && !isset($this->usertab->config)){
-
- $this->dn = array();
- foreach($this->list_get_selected_items() as $id){
- $this->dn[] = $this->list[$id]['dn'];;
- }
- $tmp = new multi_plug($this->config,"usertabs",$this->config->data['TABS']['USERTABS'],
- $this->dn,$this->DivListUsers->selectedBase,"user");
- if ($tmp->entries_locked()){
- return($tmp->display_lock_message());
- }
- $tmp->lock_entries($this->ui->dn);
- if($tmp->multiple_available()){
- $this->usertab = $tmp;
- $this->usertab->set_active_tab($s_tab);
- set_object_info($this->usertab->get_object_info());
- }
- }
-
-
- /********************
- Edit canceled
- ********************/
-
- /* Reset all relevant data, if we get a _cancel request */
- if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){
- if (isset($this->usertab)){
- $this->remove_lock();
- }
- $this->usertab= NULL;
- $this->lognames= array();;
- $this->sn= "";
- $this->givenName= "";
- $this->uid= "";
- set_object_info();
- }
-
-
- /********************
- 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" || $s_action == "templatize_multiple"){
-
- $this->templates= array();
- $ldap= $this->config->get_ldap_link();
-
- /* Create list of templates */
- foreach ($this->config->departments as $key => $value){
-
- /* Get acls from different ou's */
- $acl = $this->ui->get_permissions($value,"users/user") ;
-
- /* If creation of a new user is allowed, append this template */
- if (preg_match("/c/",$acl)){
-
- /* Search all templates from the current dn */
- $ldap->cd (get_people_ou().$value);
- $ldap->search ("(objectClass=gosaUserTemplate)", array("uid"));
-
- /* Append */
- if ($ldap->count() != 0){
- while ($attrs= $ldap->fetch()){
- $this->templates[$ldap->getDN()]=
- $attrs['uid'][0]." - ".LDAP::fix($key);
- }
- if ($s_action != "templatize_multiple"){
- $this->templates['none']= _("none");
- }
- }
- }
- }
-
- /* Sort templates */
- natcasesort ($this->templates);
- reset ($this->templates);
- }
-
-
- /********************
- Apply template to multiple entries requested, display confirm dialog
- ********************/
-
- if ($s_action=="templatize_multiple"){
- $ids = $this->list_get_selected_items();
- $this->dns = array();
- 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;
- }
- }
-
- $smarty->assign("templates", $this->templates);
-
- return($smarty->fetch(get_template_path('templatize.tpl', TRUE)));
- }
-
- /* Perform templatizing after the button has been pressed */
- if ($s_action == "templatize_continue"){
-
- $acl = $this->ui->get_permissions($_POST['template'], "users/user");
-
- /* Template readable? */
- if (preg_match('/r/', $acl)){
- $template_dn= $_POST['template'];
-
- foreach ($this->dns as $dn){
- $acl = $this->ui->get_permissions($_POST['template'], "users/user");
- if (preg_match('/w/', $acl)){
- $usertab= new usertabs($this->config, $this->config->data['TABS']['USERTABS'], $dn);
- $usertab->adapt_from_template($template_dn, array("sn", "givenName", "uid"));
- $usertab->save();
- unset ($usertab);
- $usertab= NULL;
- } else {
- msg_dialog::display(_("Permission error"), sprintf(_("You have no permission to modify object '%s'!"), $dn), ERROR_DIALOG);
- }
- }
- } else {
- msg_dialog::display(_("Permission error"), _("You have no permission to use this template!"), ERROR_DIALOG);
- }
-
- }
-
-
- /********************
- Delete MULTIPLE entries requested, display confirm dialog
- ********************/
-
- if ($s_action=="del_multiple" || $s_action == "del"){
-
- if($s_action == "del"){
-
- /* Get 'dn' from posted 'uid' */
- $ids = array($s_entry);
- }else{
- $ids = $this->list_get_selected_items();
- }
-
- $this->dns = array();
- if(count($ids)){
- $disallowed = array();
- foreach($ids as $id){
- $dn = $this->list[$id]['dn'];
- $acl = $this->ui->get_permissions($dn, "users/user");
- if(preg_match("/d/",$acl)){
- $this->dns[$id] = $dn;
- }else{
- $disallowed[] = $dn;
- }
- }
-
- if(count($disallowed)){
- msg_dialog::display(_("Permission"),msgPool::permDelete($disallowed),INFO_DIALOG);
- }
-
- if(count($this->dns)){
-
- /* Check locks */
- if ($user= get_multiple_locks($this->dns)){
- return(gen_locked_message($user,$this->dns));
- }
-
- $dns_names = array();
- foreach($this->dns as $dn){
- $dns_names[] = LDAP::fix($dn);
- }
-
- add_lock($this->dns, $this->ui->dn);
-
- /* Lock the current entry, so nobody will edit it during deletion */
- $info = sprintf(msgPool::deleteInfo($dns_names,_("user")));
-
- /* Lock the current entry, so nobody will edit it during deletion */
- $smarty->assign("info", msgPool::deleteInfo($dns_names));
- return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
- }
- }
- }
-
-
- /********************
- Delete MULTIPLE entries confirmed
- ********************/
-
- if(isset($_POST['delete_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 ();
- unset ($this->usertab);
- $this->usertab= NULL;
- } else {
- msg_dialog::display(_("Warning"),msgPool::permDelete($dn),WARNING_DIALOG);
- if(isset($this->ui->uid)){
- new log("security","users/".get_class($this),$dn,array(),"Tried to trick deletion.");
- }
- }
- }
- /* Remove lock file after successfull deletion */
- $this->remove_lock();
- $this->dns = array();
- }
-
-
- /********************
- Toggle lock status for user
- ********************/
-
- if($s_action == "toggle_lock_status" && isset($this->list[$s_entry])){
-
- /* Get entry check current status */
- $val = $this->list[$s_entry];
- if (!preg_match("/w/",$this->ui->get_permissions($val['dn'],"users/password"))){
- msg_dialog::display(_("Account locking"),
- _("You have no permission to change the lock status for this user!"),WARNING_DIALOG);
- }else{
- $pwd = $val['userPassword'][0];
- $method = passwordMethod::get_method($pwd,$val['dn']);
- $success= false;
- if($method instanceOf passwordMethod){
- if($method->is_locked($this->config,$val['dn'])){
- $success= $method->unlock_account($this->config,$val['dn']);
- }else{
- $success= $method->lock_account($this->config,$val['dn']);
- }
-
- /* Check for success */
- if (!$success){
- $hn= $method->get_hash_name();
- if (is_array($hn)){
- $hn= $hn[0];
- }
- msg_dialog::display(_("Account locking"),
- sprintf(_("Password method '%s' does not support locking. Account has not been locked!"), $hn),WARNING_DIALOG);
- }
- }else{
- // Can't lock unknown methods.
- }
-
- }
- }
-
- /********************
- Delete entry Canceled
- ********************/
-
- /* Delete user canceled? */
- if (isset($_POST['delete_cancel'])){
-
- /* Remove lock file after successfull deletion */
- $this->remove_lock();
- $this->dns = array();
- }
-
-
- /********************
- 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. */
- 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;
- $this->usertab->save_object();
- $message= $this->usertab->check();
-
- /* Save, or display error message? */
- if (count($message) == 0){
-
- /* No errors. Go ahead and prepare to ask for a password
- in case we're creating a new user. 'dn' will be 'new'
- in this case. It is set to the correct value later. */
- if ($this->dn == "new"){
- $set_pass= 1;
- } else {
- $set_pass= 0;
- }
-
- /* Save user data to ldap */
- if($this->usertab->save() == 1){
- return;
- }
-
- if (!isset($_POST['edit_apply'])){
- /* User has been saved successfully, remove lock from LDAP. */
- if ($this->dn != "new"){
- $this->remove_lock();
- }
-
- /* 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;
- set_object_info();
- }else{
-
- /* Reinitialize tab */
- if($this->usertab instanceof tabs){
- $this->usertab->re_init();
- }
- }
- } else {
- /* Ok. There seem to be errors regarding to the tab data,
- show message and continue as usual. */
- msg_dialog::displayChecks($message);
- }
- }
-
-
-
- /********************
- 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[]= msgPool::invalid(_("Template"));
- }
- if(!isset($_POST['sn']) || (empty($_POST['sn']))){
- $message[]= msgPool::required(_("Name"));
- }
- if(!isset($_POST['givenName']) || (empty($_POST['givenName']))){
- $message[]= msgPool::required(_("Given name"));
- }
-
- /* Show error message / continue editing */
- if (count($message) > 0){
- msg_dialog::displayChecks($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";
-
- $this->got_uid= ($this->config->get_cfg_value("idGenerator") == "");
-
- /* Create new usertab object */
- $this->usertab= new usertabs($this->config,$this->config->data['TABS']['USERTABS'], $this->dn);
- $this->usertab->by_object['user']->base= $this->DivListUsers->selectedBase;
- $this->usertab->set_acl_base($this->DivListUsers->selectedBase);
-
- /* Take care about templates */
- if ($s_action=="new_tpl"){
- $this->is_template= TRUE;
- $this->usertab->set_template_mode ();
- } else {
- $this->is_template= FALSE;
- }
-
- /* Use template if there are any of them */
- if ((count($this->templates) && ($s_action!='new_tpl'))||($s_action=="create_user_from_tpl")){
- foreach(array("sn", "givenName", "uid", "got_uid", "templates") as $attr){
- $smarty->assign("$attr", $this->$attr);
- }
- if ($s_action=="create_user_from_tpl"){
- $smarty->assign("template", $this->dn= $this->list[trim($s_entry)]['dn']);
- } else {
- $smarty->assign("template", "none");
- }
- $smarty->assign("edit_uid", "");
- return($smarty->fetch(get_template_path('template.tpl', TRUE)));
- }
- }
-
- /********************
- 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'];
-
- /* Check for requred values */
- $message= array();
- if ($this->sn == "") {
- $message[]= msgPool::required(_("Name"));
- }
- if ($this->givenName == "") {
- $message[]= msgPool::required(_("Given name"));
- }
-
- /* Check if dn is used */
- $dn= preg_replace("/^[^,]+,/i", "", $_POST['template']);
- $ldap= $this->config->get_ldap_link();
- $ldap->cd ($dn);
- $ldap->search ("(&(sn=".normalizeLdap($this->sn).")(givenName=".normalizeLdap($this->givenName)."))", array("givenName"));
- if ($ldap->count () != 0){
- msgPool::duplicated(_("Name"));
- }
-
- /* Show error message / continue editing */
- if (count($message) > 0){
- msg_dialog::displayChecks($message);
- } else {
- $attributes= array('sn' => $this->sn, 'givenName' => $this->givenName);
- if ($this->config->get_cfg_value("idGenerator") != ""){
- $uids= gen_uids ($this->config->get_cfg_value("idGenerator"), $attributes);
- if (count($uids)){
- $smarty->assign("edit_uid", "false");
- $smarty->assign("uids", $uids);
- $this->uid= current($uids);
- }
- } else {
- $smarty->assign("edit_uid", "");
- $this->uid= "";
- }
- $this->got_uid= true;
- }
-
- foreach(array("sn", "givenName", "uid", "got_uid", "templates") as $attr){
- $smarty->assign("$attr", $this->$attr);
- }
- if (isset($_POST['template'])){
- $smarty->assign("template", $_POST['template']);
- }
- 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){
- if (isset($_POST[$attr])){
- $this->usertab->by_object['user']->$attr= $_POST[$attr];
- }
- }
- }
-
-
- /********************
- Template selected continue edit
- ********************/
-
- /* Finish template preamble */
- if (isset($_POST['template_continue']) && $_POST['template'] != 'none' && (isset($_POST['uid']))){
-
- /* Move user supplied data to sub plugins */
- foreach(array("uid","sn","givenName") as $attr){
- $this->$attr = $_POST[$attr];
- $this->usertab->$attr = $this->$attr;
- $this->usertab->by_object['user']->$attr = $this->$attr;
- }
-
- $template_dn = $_POST['template'];
- $this->usertab->adapt_from_template($template_dn, array("uid","cn","givenName","sn"));
- $template_base = preg_replace("/^[^,]+,".preg_quote(get_people_ou(), '/')."/", '', $template_dn);
- $this->usertab->by_object['user']->base= $template_base;
- }
-
-
- /********************
- If no template was selected set base
- ********************/
-
- if (isset($_POST['template_continue']) && ($_POST['template'] == 'none')){
- $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();
-
- /* Don't show buttons if tab dialog requests this */
-
- $dia = FALSE;
- if(isset($this->usertab->by_object[$this->usertab->current]->dialog)){
- $dia = $this->usertab->by_object[$this->usertab->current]->dialog;
- }
-
- if(!is_object($dia) && $dia != TRUE){
- if(($this->usertab instanceOf tabs || $this->usertab instanceOf plugin) && $this->usertab->read_only == TRUE){
- $display.= "<p style=\"text-align:right\">
- <input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">
- </p>";
- }else{
- $display.= "<p style=\"text-align:right\">\n";
- $display.= "<input type=submit name=\"edit_finish\" style=\"width:80px\" value=\"".msgPool::okButton()."\">\n";
- $display.= " \n";
- if ($this->dn != "new"){
- $display.= "<input type=submit name=\"edit_apply\" value=\"".msgPool::applyButton()."\">\n";
- $display.= " \n";
- }
- $display.= "<input type=submit name=\"edit_cancel\" value=\"".msgPool::cancelButton()."\">\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(),$this)){
- return($str);
- }
-
- /* Return rendered main page */
- $this->DivListUsers->parent = $this;
- $this->DivListUsers->execute();
-
- /* Add departments if subsearch is disabled */
- if(!$this->DivListUsers->SubSearch){
- $this->DivListUsers->AddDepartments($this->DivListUsers->selectedBase,4,1);
- }
- $this->reload();
- $this->DivListUsers->setEntries($this->list);
-
- # FILTER Test #################################################
- ## Build filter
- #if (!$this->filter) {
- # $this->filter = new filter(get_template_path("user-filter.xml", true));
- # $this->filter->setObjectStorage(get_people_ou());
- #}
- #$this->filter->update();
- #session::set('autocomplete', $this->filter);
- #if (!$this->filter->isValid()){
- # msg_dialog::display(_("Filter error"), _("The filter is uncomplete!"), ERROR_DIALOG);
- #}
-
- ## Build headpage
- #if (!$this->headpage){
- # $this->headpage = new listing(get_template_path("user-list.xml", true));
- # $this->headpage->registerElementFilter("accountProperties", "userManagement::filterProperties");
- # $this->headpage->registerElementFilter("lockLabel", "userManagement::filterLockLabel");
- # $this->headpage->registerElementFilter("lockImage", "userManagement::filterLockImage");
- # $this->headpage->setFilter($this->filter);
- #}
-
- ## Needs to be called before update!
- #$action= $this->headpage->getAction();
- #if ($action['action'] != '') {
- # echo "List detected action:";
- # print_a($action);
- #}
-
- ## Refresh for filter
- #$this->headpage->update();
- #
- #return($this->headpage->render());
- ################################################### FILTER Test
-
- return($this->DivListUsers->Draw());
- }
-
-
- static function filterLockImage($userPassword)
+ function __construct($config,$ui)
{
- $image= "images/empty.png";
-
- if(isset($userPassword[0]) && preg_match("/^\{[^\}]/",$userPassword[0])){
- if(preg_match("/^[^\}]*+\}!/",$userPassword[0])){
- $image= "images/lists/locked.png";
- }else{
- $image= "images/lists/unlocked.png";
- }
- }
-
- return $image;
- }
+ // Build filter
+ $filter = new filter(get_template_path("user-filter.xml", true));
+ $filter->setObjectStorage("ou=people,");
+ // Build headpage
+ $headpage = new listing(get_template_path("user-list.xml", true));
+ $headpage->setFilter($filter);
- static function filterLockLabel($userPassword)
- {
- $label= "";
-
- if(isset($userPassword[0]) && preg_match("/^\{[^\}]/",$userPassword[0])){
- if(preg_match("/^[^\}]*+\}!/",$userPassword[0])){
- $label= _("Unlock account");
- }else{
- $label= _("Lock account");
- }
- }
+ parent::__construct($config, $ui, "users", $headpage);
- return $label;
+ $this->registerAction("new", "newEntry");
+ $this->registerAction("edit", "editEntry");
+ $this->registerAction("apply", "applyChanges");
+ $this->registerAction("save", "saveChanges");
+ $this->registerAction("cancel", "cancelEdit");
+ $this->registerAction("remove", "removeEntryRequested");
+ $this->registerAction("removeConfirmed", "removeEntryConfirmed");
}
-
-
- static function filterProperties($dn, $row, $class)
- {
- $result= "";
-
- $map= array( "gosaAccount" => array( "image" => "plugins/users/images/select_user.png",
- "plugin" => "user",
- "alt" => _("Generic"),
- "title" => _("Edit generic properties")),
- "posixAccount" => array("image" => "images/penguin.png",
- "plugin" => "posixAccount",
- "alt" => _("POSIX"),
- "title" => _("Edit POSIX properties")),
- "gosaMailAccount" => array("image" => "images/mailto.png",
- "alt" => _("Mail"),
- "plugin" => "mailAccount",
- "title" => _("Edit mail properties")),
- "sambaSamAccount" => array("image" => "plugins/systems/images/select_winstation.png",
- "plugin" => "sambaAccount",
- "alt" => _("Samba"),
- "title" => _("Edit samba properties")),
- "apple-user" => array("image" => "plugins/netatalk/images/select_netatalk.png",
- "plugin" => "sambaAccount",
- "alt" => _("Netatalk"),
- "title" => _("Edit netatalk properties")),
- "gotoEnvironment" => array("image" => "plugins/users/images/small_environment.png",
- "plugin" => "gotoEnvironment",
- "alt" => _("Environment"),
- "title" => _("Edit environment properties")),
- "goFaxAccount" => array("image" => "plugins/users/images/fax_small.png",
- "plugin" => "goFaxAccount",
- "alt" => _("FAX"),
- "title" => _("Edit FAX properties")),
- "goFonAccount" => array("image" => "plugins/gofon/images/select_phone.png",
- "plugin" => "goFonAccount",
- "alt" => _("Phone"),
- "title" => _("Edit phone properties")));
-
- // Walk thru map
- foreach ($map as $oc => $properties) {
- if (in_array($oc, $class)) {
- $result.="<input class='center' type='image' src='".$properties['image']."' ".
- "alt='".$properties['alt']."' title='".$properties['title'].
- "' name='listing_edit_".$properties['plugin']."_$row' style='padding:1px'>";
- } else {
- $result.="<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
- }
- }
-
- return $result;
- }
-
-
-
- /* 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 */
- $base= $this->DivListUsers->selectedBase;
- $this->list =array();
-
- /* Get filter configuration */
- $Regex = $this->DivListUsers->Regex;
- $SubSearch = $this->DivListUsers->SubSearch;
- $ShowTemplates = $this->DivListUsers->ShowTemplates;
- $ShowFunctionalUsers = $this->DivListUsers->ShowFunctionalUsers;
- $ShowUnixUsers = $this->DivListUsers->ShowUnixUsers;
- $ShowMailUsers = $this->DivListUsers->ShowMailUsers;
- $ShowSambaUsers = $this->DivListUsers->ShowSambaUsers;
- $ShowProxyUsers = $this->DivListUsers->ShowProxyUsers;
- $ShowPhoneUsers = $this->DivListUsers->ShowPhoneUsers;
-
- /* Setup filter depending on selection */
- $filter="";
- $samba= "sambaSamAccount";
-
- if ($ShowFunctionalUsers){
- $filter.= "(&(objectClass=gosaAccount)(!(|(objectClass=posixAccount)".
- "(objectClass=gosaMailAccount)(objectClass=$samba)".
- "(objectClass=gosaProxyAccount))))";
- }
- if ($ShowUnixUsers){
- $filter.= "(objectClass=posixAccount)";
- }
- if ($ShowMailUsers){
- $filter.= "(objectClass=gosaMailAccount)";
- }
- if ($ShowSambaUsers){
- $filter.= "(objectClass=$samba)";
- }
- if ($ShowProxyUsers){
- $filter.= "(objectClass=gosaProxyAccount)";
- }
- if ($ShowPhoneUsers){
- $filter.= "(objectClass=gofonAccount)";
- }
- if ($ShowTemplates){
- $filter= "(|(objectClass=gosaUserTemplate)(&(objectClass=gosaAccount)(|$filter)))";
- } else {
- $filter= "(&(objectClass=gosaAccount)(objectClass=person)".
- "(objectClass=inetOrgPerson)(objectClass=organizationalPerson)".
- "(!(objectClass=gosaUserTemplate))(|$filter))";
- }
- $filter= "(&(|(uid=".normalizeLdap($Regex).")(sn=".normalizeLdap($Regex).")(givenName=".normalizeLdap($Regex)."))$filter)";
-
- /* Generate userlist */
- $ldap= $this->config->get_ldap_link(TRUE);
-
- if ($SubSearch){
- $ListTemp = get_sub_list($filter, "users", get_people_ou(),$base,
- array("uid", "givenName", "sn", "objectClass","userPassword"), GL_SUBSEARCH | GL_SIZELIMIT);
- } else {
- $base= get_people_ou().$base;
- $ListTemp = get_sub_list($filter, "users", get_people_ou(),$base,
- array("uid", "givenName", "sn", "objectClass","userPassword"), GL_SIZELIMIT);
- }
- $SortTemp = array();
- $List = array();
-
- foreach($ListTemp as $Key => $Entry){
-
- /* Due to the fact that "inetOrgPerson" is derived from "organizationalPerson" and that openldap
- doesn't differentiate both classes in search filters, we have to skip entries that do not provide
- both classes. (Both classes are required for a valid GOsa user Account.)
- */
- if(!in_array("inetOrgPerson",$Entry['objectClass'])|| !in_array("organizationalPerson",$Entry['objectClass'])){
- continue;
- }
-
- /* 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("/".preg_quote(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;
- }
- }
- natcasesort($SortTemp);
- reset($SortTemp);
-
- $this->list = array();
- foreach($SortTemp as $Key){
- $this->list[] = $List[$Key];
- }
- }
-
-
- function remove_lock()
- {
- /* Remove user lock if a DN is marked as "currently edited" */
- if (isset($this->usertab->dn)){
- del_lock ($this->usertab->dn);
- }elseif(isset($this->dn) && !empty($this->dn) && $this->dn != "new"){
- del_lock($this->dn);
- }
- if(isset($this->dns) && is_array($this->dns) && count($this->dns)){
- del_lock($this->dns);
- }
- }
-
-
- function copyPasteHandling_from_queue($s_action,$s_entry)
- {
- /* Check if Copy & Paste is disabled */
- if(!is_object($this->CopyPasteHandler)){
- return("");
- }
-
- $ui = get_userinfo();
-
- /* Add a single entry to queue */
- if($s_action == "cut" || $s_action == "copy"){
-
- /* Cleanup object queue */
- $this->CopyPasteHandler->cleanup_queue();
- $dn = $this->list[$s_entry]['dn'];
- if($s_action == "copy" && $ui->is_copyable($dn,"users","user")){
- $this->CopyPasteHandler->add_to_queue($dn,$s_action,"usertabs","USERTABS","users");
- }
- if($s_action == "cut" && $ui->is_cutable($dn,"users","user")){
- $this->CopyPasteHandler->add_to_queue($dn,$s_action,"usertabs","USERTABS","users");
- }
- }
-
- /* Add entries to queue */
- if($s_action == "copy_multiple" || $s_action == "cut_multiple"){
-
- /* Cleanup object queue */
- $this->CopyPasteHandler->cleanup_queue();
-
- /* Add new entries to CP queue */
- foreach($this->list_get_selected_items() as $id){
- $dn = $this->list[$id]['dn'];
-
- if($s_action == "copy_multiple" && $ui->is_copyable($dn,"users","user")){
- $this->CopyPasteHandler->add_to_queue($dn,"copy","usertabs","USERTABS","users");
- }
- if($s_action == "cut_multiple" && $ui->is_cutable($dn,"users","user")){
- $this->CopyPasteHandler->add_to_queue($dn,"cut","usertabs","USERTABS","users");
- }
- }
- }
-
- /* Start pasting entries */
- if($s_action == "editPaste"){
- $this->start_pasting_copied_objects = TRUE;
- }
-
- /* Return C&P dialog */
- if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
-
- /* Get dialog */
- $this->CopyPasteHandler->SetVar("base",$this->DivListUsers->selectedBase);
- $data = $this->CopyPasteHandler->execute();
-
- /* Set CPPasswordChange to s_entry which indicates that this entry requires a new password. */
- if(isset($_POST['passwordTodo']) && ($_POST['passwordTodo'] == "new")){
- $s_entry = $this->CopyPasteHandler->last_entry();
- $this->reload();
- foreach($this->list as $key => $entry){
- if($entry['dn'] == $s_entry){
- $this->CPPasswordChange = $key;
- }
- }
- }
-
- /* Return dialog data */
- if(!empty($data) && $this->CPPasswordChange == ""){
- return($data);
- }
- }
-
- /* Automatically disable status for pasting */
- if(!$this->CopyPasteHandler->entries_queued()){
- $this->start_pasting_copied_objects = FALSE;
- }
- return("");
- }
-
-
- function save_object()
- {
- /* Handle divlist filter && department selection*/
- if(!is_object($this->usertab)){
- $this->DivListUsers->save_object();
- }
- if(is_object($this->CopyPasteHandler)){
- $this->CopyPasteHandler->save_object();
- }
- }
-
-
- 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() { }
- function check() { }
- function save() { }
- function adapt_from_template($dn, $skip= array()) { }
- function password_change_needed() { }
-
-} /* ... class userManagement */
+}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>
index 1b37c9d462cc685b7e6a70ef3462677405d15199..ce28ef5745810f7a3476926769e5a0bb312058d5 100644 (file)
/* Create usermanagement object on demand */
if (!session::is_set('userManagement')){
$userManagement= new userManagement ($config, $ui);
- $userManagement->set_acl_category("users");
session::set('userManagement',$userManagement);
}
$userManagement = session::get('userManagement');
- $userManagement->save_object();
- $output= $userManagement->execute();
-
- /* Page header*/
- if (get_object_info() != ""){
- $display= print_header(get_template_path($userManagement->plIcon),
- _("User administration"),
- "<img alt=\"\" class=\"center\" src=\"".
- get_template_path('images/lists/locked.png').
- "\"> ".LDAP::fix(get_object_info()));
- } else {
- $display= print_header(get_template_path($userManagement->plIcon),
- _("User administration"));
- }
-
- /* Generate dialog output */
- $display.= $output;
+ $display= $userManagement->execute();
/* Reset requested? */
if (isset($_GET['reset']) && $_GET['reset'] == 1){
index 644c7352a53595c2bd2d6f155b68ad073af3b434..f60f42d2599ceb8022bb7afa36d693eabe23924d 100644 (file)
</p>
<p class="plugbottom">
- <input type=submit name="delete_user_confirm" value="{msgPool type=delButton}">
+ <input type=submit name="delete_confirmed" value="{msgPool type=delButton}">
<input type=submit name="delete_cancel" value="{msgPool type=cancelButton}">
</p>
diff --git a/gosa-core/plugins/admin/users/user-filter.tpl b/gosa-core/plugins/admin/users/user-filter.tpl
index 7ef964afdd8b937f09f38890894f86d2789f630c..4eecb3e52c7c22a8d5ce874947576fc64dbb19fe 100644 (file)
<div class="contentboxh">
<p class="contentboxh">
- <img src="images/launch.png" align="right" alt="[F]">Filter
+ <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t}
</p>
</div>
<div class="contentboxb">
<div style="border-top:1px solid #AAAAAA"></div>
- {$ALPHABET}
- <div style="border-top:1px solid #AAAAAA"></div>
- {$TEMPLATE} {t}Show templates{/t}<br>
- {$GENERIC} {t}Show functional users{/t}<br>
- {$MAIL} {t}Show mail users{/t}<br>
- {$POSIX} {t}Show POSIX users{/t}<br>
- {$SAMBA} {t}Show samba users{/t}<br>
- <div style="border-top:1px solid #AAAAAA"></div>
- {$SCOPE}
-
<table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
<tr>
<td>
- <label for="Regex">
- <img alt="Zeige die Benutzer, auf die Folgendes passt" src="images/lists/search.png" align=middle>
+ <label for="NAME">
+ <img src="images/lists/search.png" align=middle> Name
</label>
</td>
- <td width="99%">
+ <td>
{$NAME}
</td>
</tr>
- </table>
-
<table summary="" width="100%" style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
<tr>
<td width="100%" align="right">
</td>
</tr>
</table>
-
</div>
diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index eb9d83f3d11d44938e01c265ff106f9459d5bea0..1042de9b688063a09fc5da7871a46e8d7ca8816c 100644 (file)
<search>
<query>
<backend>LDAP</backend>
- <filter>(&(!(objectClass=gosaUserTemplate))(|$GENERIC$POSIX$MAIL$SAMBA)(|(cn=$NAME)(sn=$NAME)(givenName=$NAME)(uid=$NAME)))</filter>
+ <filter>(&(objectClass=person)$NAME)</filter>
<attribute>dn</attribute>
<attribute>objectClass</attribute>
<attribute>givenName</attribute>
<attribute>sn</attribute>
- <attribute>uid</attribute>
- <attribute>modifyTimestamp</attribute>
- <attribute>userPassword</attribute>
+ <attribute>customerNumber</attribute>
+ <attribute>customerState</attribute>
+ <attribute>dateOfBirth</attribute>
</query>
- <query>
- <backend>LDAP</backend>
- <filter>(&$TEMPLATE(|(cn=$NAME)(sn=$NAME)(givenName=$NAME)(uid=$NAME)))</filter>
- <attribute>dn</attribute>
- <attribute>objectClass</attribute>
- <attribute>givenName</attribute>
- <attribute>sn</attribute>
- <attribute>uid</attribute>
- <attribute>modifyTimestamp</attribute>
- <attribute>userPassword</attribute>
- </query>
- <scope>auto</scope>
+ <scope>one</scope>
</search>
<element>
<type>textfield</type>
<tag>NAME</tag>
- <!--<regex>^...</regex>-->
- <alphabet>true</alphabet>
- <default>*</default>
- <unset>this is a not valid and failing filter</unset>
- <set>$</set>
+ <size>20</size>
+ <maxlength>60</maxlength>
+ <default></default>
+ <unset></unset>
+ <set>(|(cn=*$*)(sn=*$*)(givenName=*$*))</set>
<autocomplete>
<backend>LDAP</backend>
- <filter>(&(objectClass=gosaAccount)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)(uid=*$NAME*)))</filter>
+ <filter>(&(objectClass=person)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)))</filter>
<attribute>cn</attribute>
<frequency>0.5</frequency>
<characters>3</characters>
</autocomplete>
</element>
- <element>
- <type>checkbox</type>
- <tag>TEMPLATE</tag>
- <default></default>
- <unset>(&(!(objectClass=gosaUserTemplate)(!(objectClass=gosaAccount))))</unset>
- <set>(objectClass=gosaUserTemplate)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>GENERIC</tag>
- <default>true</default>
- <unset></unset>
- <set>(&(objectClass=gosaAccount)(!(|(objectClass=posixAccount)(objectClass=gosaMailAccount)(objectClass=sambaSamAccount)(objectClass=gosaProxyAccount))))</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>POSIX</tag>
- <default>true</default>
- <unset></unset>
- <set>(objectClass=posixAccount)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>MAIL</tag>
- <default>true</default>
- <unset></unset>
- <set>(objectClass=gosaMailAccount)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>SAMBA</tag>
- <default>true</default>
- <unset></unset>
- <set>(objectClass=sambaSamAccount)</set>
- </element>
-
</filterdef>
diff --git a/gosa-core/plugins/admin/users/user-list.tpl b/gosa-core/plugins/admin/users/user-list.tpl
index 1aefb23a49017f58c7bc6b0b0c4028b2e1a55cf1..d553b646b6ba52f7a6dcf2e899a349a13af4c3dd 100644 (file)
<div class="contentboxb">
<div style='background:white;padding:0px;padding:3px;'>
<table><tr>
- <td>{$ROOT} </td><td>{$BACK} </td><td>{$HOME} </td><td>{$RELOAD} </td><td>{$SEPARATOR} </td><td>{t}Base{/t} {$BASE} <input class='center' type='image' src='images/lists/submit.png' align='middle' title='{t}Update{/t}' name='submit_department' alt='{t}Submit{/t}'> </td><td>{$SEPARATOR} </td><td><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
+ <td>{$RELOAD} </td><td>{$SEPARATOR} </td><td><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
</tr></table>
</div>
</div>
diff --git a/gosa-core/plugins/admin/users/user-list.xml b/gosa-core/plugins/admin/users/user-list.xml
index c6b48996e13a4408705225b36d6aa54537550426..14555d0ee0cf57a41188948d9bae47a17d865299 100644 (file)
<objectType>
<label>Users</label>
- <objectClass>gosaAccount</objectClass>
- <objectClass>!gosaUserTemplate</objectClass>
+ <objectClass>person</objectClass>
<category>users</category>
<class>user</class>
<image>plugins/users/images/select_user.png</image>
</objectType>
- <objectType>
- <label>Templates</label>
- <objectClass>gosaUserTemplate</objectClass>
- <category>users</category>
- <class>user</class>
- <image>plugins/users/images/select_template.png</image>
- </objectType>
-
</definition>
<table>
- <layout>|20px||145px|165px;r|</layout>
+ <layout>|20px||260px|100px|120px|60px;c|140px;r|</layout>
<department>
<value>%{filter:objectType(dn,objectClass)}</value>
<department>
<value>%{filter:departmentLink(row,dn,description)}</value>
+ <span>5</span>
</department>
<column>
</column>
<column>
- <label>Name / Department</label>
- <sortAttribute>sn</sortAttribute>
+ <label>Given name</label>
+ <sortAttribute>givenName</sortAttribute>
<sortType>string</sortType>
- <value>%{filter:link(row,dn,"%s, %s [%s]",sn,givenName,uid)}</value>
+ <value>%{filter:link(row,dn,"%s",givenName)}</value>
<export>true</export>
</column>
<column>
- <label>Properties</label>
- <value>%{filter:accountProperties(dn,row,objectClass)}</value>
+ <label>Surname</label>
+ <sortAttribute>sn</sortAttribute>
+ <sortType>string</sortType>
+ <value>%{filter:link(row,dn,"%s",sn)}</value>
+ <export>true</export>
</column>
<column>
</table>
<actionmenu>
- <action>
- <type>sub</type>
- <image>images/lists/new.png</image>
- <label>Create</label>
-
- <action>
- <name>create_user</name>
- <type>entry</type>
- <image>plugins/users/images/list_new_user.png</image>
- <acl>users/user[c]</acl>
- <label>User</label>
- </action>
-
- <action>
- <name>create_template</name>
- <type>entry</type>
- <image>images/lists/new.png</image>
- <acl>users/user[c]</acl>
- <label>Template</label>
- </action>
+ <action>
+ <name>new</name>
+ <type>entry</type>
+ <image>plugins/users/images/list_new_user.png</image>
+ <label>New person</label>
</action>
<action>
<label>Edit</label>
</action>
- <action>
- <name>password</name>
- <type>entry</type>
- <image>plugins/users/images/list_password.png</image>
- <label>Change password</label>
- </action>
-
<action>
<name>remove</name>
<type>entry</type>
<label>Remove</label>
</action>
- <action>
- <name>templatize</name>
- <type>entry</type>
- <image>plugins/users/images/wizard.png</image>
- <label>Apply template</label>
- </action>
-
- <action>
- <type>separator</type>
- </action>
-
- <action>
- <type>daemon</type>
- </action>
-
- <action>
- <type>separator</type>
- </action>
-
- <action>
- <type>copypaste</type>
- </action>
-
- <action>
- <type>separator</type>
- </action>
-
- <action>
- <type>snapshot</type>
- </action>
-
<action>
<type>separator</type>
</action>
<actiontriggers snapshot="true" copypaste="true">
<action>
- <name>templatize</name>
+ <name>provision</name>
<type>entry</type>
- <objectclass>!gosaUserTemplate</objectclass>
- <image>plugins/users/images/wizard.png</image>
- <label>Apply template</label>
- </action>
-
- <action>
- <type>copypaste</type>
+ <objectclass>gosaAccount</objectclass>
+ <image>images/lists/reload.png</image>
+ <label>Provision all accounts</label>
</action>
<action>
<type>entry</type>
<objectclass>gosaAccount</objectclass>
<image>images/lists/edit.png</image>
- <label>Edit user</label>
- </action>
-
- <action>
- <name>lock</name>
- <type>entry</type>
- <objectclass>gosaAccount</objectclass>
- <image>%{filter:lockImage(userPassword)}</image>
- <acl>users/password[w]</acl>
- <label>%{filter:lockLabel(userPassword)}</label>
- </action>
-
- <action>
- <name>password</name>
- <type>entry</type>
- <objectclass>gosaAccount</objectclass>
- <image>plugins/users/images/list_password.png</image>
- <acl>users/password[w]</acl>
- <label>Change password</label>
- </action>
-
- <action>
- <type>snapshot</type>
+ <label>Edit person</label>
</action>
<action>
<name>remove</name>
<type>entry</type>
- <objectclass>gosaAccount</objectclass>
<image>images/lists/trash.png</image>
+ <objectclass>gosaAccount</objectclass>
<acl>users/user[d]</acl>
- <label>Remove user</label>
+ <label>Remove person</label>
</action>
</actiontriggers>