diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php index 34b4794481..f70dce7f5e 100755 --- a/admin/inc/class.uiaccounts.inc.php +++ b/admin/inc/class.uiaccounts.inc.php @@ -17,8 +17,6 @@ ( 'list_groups' => True, 'list_users' => True, - 'add_group' => True, - 'add_user' => True, 'delete_group' => True, 'delete_user' => True, 'edit_user' => True, @@ -274,116 +272,6 @@ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('account_list' => $data)); } - function add_user() - { - if ($GLOBALS['phpgw']->acl->check('account_access',4,'admin')) - { - $this->list_users(); - } - else - { - $this->create_edit_user(0); - } - } - - function delete_group() - { - $account_id = get_var('account_id',array('POST','GET')); - - if ($GLOBALS['phpgw']->acl->check('group_access',32,'admin')) - { - $this->list_groups(); - return False; - } - - if ($account_id && get_var('confirm',array('POST'))) - { - $this->bo->delete_group($account_id); - $this->list_groups(); - return False; - } - - $GLOBALS['phpgw']->xslttpl->add_file(array('app_data',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 'app_delete')); - $GLOBALS['phpgw_info']['flags']['app_header'] = lang('administration') . ': ' . lang('delete group'); - - $data = array - ( - 'delete_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_group&account_id=' . $account_id), - 'done_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'), - 'lang_yes' => lang('Yes'), - 'lang_no' => lang('No'), - 'lang_yes_statustext' => lang('Delete the entry'), - 'lang_no_statustext' => lang('Back to the list'), - 'lang_error_msg' => lang('are you sure you want to delete this group ?') - ); - - $old_group_list = $GLOBALS['phpgw']->acl->get_ids_for_location(intval($account_id),1,'phpgw_group'); - - if($old_group_list) - { - $group_name = $GLOBALS['phpgw']->accounts->id2name($account_id); - - $user_list = ''; - while (list(,$id) = each($old_group_list)) - { - $data['user_list'][] = array - ( - 'user_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.edit_user&account_id=' . $id), - 'user_name' => $GLOBALS['phpgw']->common->grab_owner_name($id), - 'lang_user_url_statustext' => lang('edit user') - ); - } - - $data['lang_confirm_msg'] = lang('the users bellow are still members of group %1',$group_name) . '. ' - . lang('they must be removed before you can continue'); - $data['lang_remove_user'] = lang('Remove all users from this group ?'); - } - - $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data)); - } - - function delete_user() - { - if ($GLOBALS['phpgw']->acl->check('account_access',32,'admin') || $GLOBALS['phpgw_info']['user']['account_id'] == $_GET['account_id']) - { - $this->list_users(); - return False; - } - - unset($GLOBALS['phpgw_info']['flags']['noheader']); - unset($GLOBALS['phpgw_info']['flags']['nonavbar']); - $GLOBALS['phpgw']->common->phpgw_header(); - - $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); - $t->set_file( - Array( - 'form' => 'delete_account.tpl' - ) - ); - $var = Array( - 'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.boaccounts.delete_user'), - 'account_id' => $_GET['account_id'] - ); - - // the account can have special chars/white spaces, if it is a ldap dn - $account_id = rawurlencode($_GET['account_id']); - - // Find out who the new owner is of the deleted users records... - $users = $GLOBALS['phpgw']->accounts->get_list('accounts'); - $c_users = count($users); - $str = ''; - for($i=0;$i<$c_users;$i++) - { - $str .= ''."\n"; - } - $var['lang_new_owner'] = lang('Who would you like to transfer ALL records owned by the deleted user to?'); - $var['new_owner_select'] = ''."\n"; - $var['cancel'] = lang('cancel'); - $var['delete'] = lang('delete'); - $t->set_var($var); - $t->pparse('out','form'); - } - function edit_group() { $account_id = get_var('account_id',array('POST','GET')); @@ -581,33 +469,263 @@ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('group_edit' => $data)); } - function edit_user($cd='',$account_id='') + function edit_user() { - if ($GLOBALS['phpgw']->acl->check('account_access',16,'admin')) + $cd = get_var('cd',array('GET')); + $account_id = get_var('account_id',array('GET','POST')); + $values = get_var('values',array('POST')); + $account_groups = get_var('account_groups',array('POST')); + $account_permissions = get_var('account_permissions',array('POST')); + + if (!$account_id && $GLOBALS['phpgw']->acl->check('account_access',4,'admin')) { - $this->list_users(); + $this->list_user(); return False; } - $cdid = $cd; + if ($account_id && $GLOBALS['phpgw']->acl->check('account_access',16,'admin')) + { + $this->list_user(); + return False; + } + + /*$cdid = $cd; settype($cd,'integer'); $cd = ($_GET['cd']?$_GET['cd']:intval($cdid)); $accountid = $account_id; settype($account_id,'integer'); - $account_id = ($_GET['account_id']?$_GET['account_id']:intval($accountid)); + $account_id = ($_GET['account_id']?$_GET['account_id']:intval($accountid));*/ - // todo - // not needed if i use the same file for new users too - if (! $account_id) + if ($values['save']) { - $this->list_users(); - return False; + $error = $this->bo->validate_user($values); + + if (is_array($error)) + { + + } + else + { + if (is_array($account_groups)) + { + $values['account_groups'] = $account_groups; + } + + if (is_array($account_permissions)) + { + $values['account_permissions'] = $account_permissions; + } + + if ($values['account_id']) + { + $this->bo->edit_user($values); + $account_id = $values['account_id']; + } + else + { + $this->bo->add_user($values); + Header('Location: ' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_user')); + } + } } - else + + $sbox = createobject('phpgwapi.sbox'); + + if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes'] && ($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap')) { - $this->create_edit_user($account_id); } + + print_debug('Type : '.gettype($_userData).'
_userData(size) = "'.$_userData.'"('.strlen($_userData).')'); + + $GLOBALS['phpgw']->xslttpl->add_file(array('app_data','users')); + $GLOBALS['phpgw_info']['flags']['app_header'] = lang('administration') . ': ' . ($account_id?lang('edit user account'):lang('add user account')); + + if (is_array($_userData)) + { + $userData = Array(); + $userData=$_userData; + @reset($userData['account_groups']); + while (list($key, $value) = @each($userData['account_groups'])) + { + $userGroups[$key]['account_id'] = $value; + } + + $account = CreateObject('phpgwapi.accounts'); + $allGroups = $account->get_list('groups'); + } + elseif(is_string($_userData) && $_userData=='') + { + if($_account_id) + { + $account = CreateObject('phpgwapi.accounts',intval($_account_id),'u'); + $userData = $account->read_repository(); + $userGroups = $account->membership($_account_id); + } + else + { + $account = CreateObject('phpgwapi.accounts'); + $userData = Array(); + $userData['status'] = 'A'; + $userGroups = Array(); + } + $allGroups = $account->get_list('groups'); + + if ($userData['expires'] == -1) + { + $userData['account_expires_month'] = 0; + $userData['account_expires_day'] = 0; + $userData['account_expires_year'] = 0; + } + else + { + /* Change this to be an admin/setup setting. For now, default to expire one week from today. */ + $time_var = time() + (60*60*24*7); + $userData['account_expires_month'] = date('m',$userData['expires'] > 0 ? $userData['expires'] : $time_var); + $userData['account_expires_day'] = date('d',$userData['expires'] > 0 ? $userData['expires'] : $time_var); + $userData['account_expires_year'] = date('Y',$userData['expires'] > 0 ? $userData['expires'] : $time_var); + } + } + + if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes']) + { + $lang_homedir = lang('home directory'); + $lang_shell = lang('login shell'); + $homedirectory = ''; + $loginshell = ''; + } + + $_y = $sbox->getyears('account_expires_year',$userData['account_expires_year'],date('Y'),date('Y')+10); + $_m = $sbox->getmonthtext('account_expires_month',$userData['account_expires_month']); + $_d = $sbox->getdays('account_expires_day',$userData['account_expires_day']); + + /* $account_file_space = ''; + if (!$userData['file_space']) + { + $userData['file_space'] = $GLOBALS['phpgw_info']['server']['vfs_default_account_size_number'] . "-" . $GLOBALS['phpgw_info']['server']['vfs_default_account_size_type']; + } + $file_space_array = explode ('-', $userData['file_space']); + $account_file_space_number = $file_space_array[0]; + $account_file_space_type = $file_space_array[1]; + $account_file_space_type_selected[$account_file_space_type] = ' selected'; + + $account_file_space = ''; + $account_file_space_select =''; + + $var = Array( + 'lang_file_space' => 'File space', + 'account_file_space' => $account_file_space, + 'account_file_space_select' => $account_file_space_select + ); + $t->set_var($var); + */ + + $groups_select = ''; + reset($allGroups); + while (list($key,$value) = each($allGroups)) + { + $group_list[] = array + ( + 'account_id' => $value['account_id'], + 'account_lid' => $value['account_lid'] + ); + + for ($i=0; $i"; */ + if (@$userGroups[$i]['account_id'] == $value['account_id']) + { + $group_list[]['selected'] = 'yes'; + } + } + } + + /* create list of available apps */ + $i = 0; + $apps = CreateObject('phpgwapi.applications',$_account_id); + $db_perms = $apps->read_account_specific(); + + @reset($GLOBALS['phpgw_info']['apps']); + $availableApps = $GLOBALS['phpgw_info']['apps']; + @asort($availableApps); + @reset($availableApps); + while (list($key,$application) = each($availableApps)) + { + if ($application['enabled'] && $application['status'] != 3) + { + $perm_display[$i]['appName'] = $key; + $perm_display[$i]['translatedName'] = $application['title']; + $i++; + } + } + + /* create apps output */ + $appRightsOutput = ''; +// @reset($perm_display); + for ($i=0;$i $perm_display[$i]['translatedName'], + 'checkbox_name' => 'account_permissions[' . $perm_display[$i]['appName'] . ']', + 'checked' => ($userData['account_permissions'][$perm_display[$i]['appName']] || $db_perms[$perm_display[$i]['appName']]?'yes':'') + ); + } + + $page_params['menuaction'] = 'admin.boaccounts.edit_user'; + if($_account_id) + { + $page_params['account_id'] = $_account_id; + $page_params['old_loginid'] = rawurlencode($userData['account_lid']); + } + + $data = array + ( + 'edit_url' => $GLOBALS['phpgw']->link('/index.php',$page_params), + 'done_url' => $GLOBALS['phpgw']->link('/admin/index.php'), + 'lang_lid' => lang('loginid'), + 'lang_account_active' => lang('account active'), + 'lang_password' => lang('password'), + 'lang_reenter_password' => lang('Re-Enter Password'), + 'lang_lastname' => lang('lastname'), + 'lang_groups' => lang('groups'), + 'lang_expires' => lang('expires'), + 'lang_firstname' => lang('firstname'), + 'lang_applications' => lang('applications'), + 'lang_save' => lang('save'), + 'lang_cancel_done' => ((is_array($values) && !$error)?lang('done'):lang('cancel')), + 'select_expires' => $GLOBALS['phpgw']->common->dateformatorder($_y,$_m,$_d,True), + 'lang_never' => lang('Never'), + 'account_lid' => $userData['account_lid'], + 'lang_homedir' => $lang_homedir, + 'lang_shell' => $lang_shell, + 'homedirectory' => $homedirectory, + 'loginshell' => $loginshell, + 'account_status' => ($userData['status']?'yes':''), + 'account_firstname' => $userData['firstname'], + 'account_lastname' => $userData['lastname'], + 'account_passwd' => $account_passwd, + 'account_passwd_2' => $account_passwd_2, + 'expires' => (($userData['expires'] == -1)?'yes':''), + 'group_list' => $group_list, + 'app_list' => $app_list + ); + + /* create the menu on the left, if needed + $menuClass = CreateObject('admin.uimenuclass'); + This is now using ExecMethod() + $t->set_var('rows',ExecMethod('admin.uimenuclass.createHTMLCode','edit_user')); */ + $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('account_edit' => $data)); } function view_user() @@ -766,6 +884,104 @@ $t->pfp('out','form'); } + function delete_group() + { + $account_id = get_var('account_id',array('POST','GET')); + + if ($GLOBALS['phpgw']->acl->check('group_access',32,'admin')) + { + $this->list_groups(); + return False; + } + + if ($account_id && get_var('confirm',array('POST'))) + { + $this->bo->delete_group($account_id); + $this->list_groups(); + return False; + } + + $GLOBALS['phpgw']->xslttpl->add_file(array('app_data',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 'app_delete')); + $GLOBALS['phpgw_info']['flags']['app_header'] = lang('administration') . ': ' . lang('delete group'); + + $data = array + ( + 'delete_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_group&account_id=' . $account_id), + 'done_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.list_groups'), + 'lang_yes' => lang('Yes'), + 'lang_no' => lang('No'), + 'lang_yes_statustext' => lang('Delete the entry'), + 'lang_no_statustext' => lang('Back to the list'), + 'lang_error_msg' => lang('are you sure you want to delete this group ?') + ); + + $old_group_list = $GLOBALS['phpgw']->acl->get_ids_for_location(intval($account_id),1,'phpgw_group'); + + if($old_group_list) + { + $group_name = $GLOBALS['phpgw']->accounts->id2name($account_id); + + $user_list = ''; + while (list(,$id) = each($old_group_list)) + { + $data['user_list'][] = array + ( + 'user_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.edit_user&account_id=' . $id), + 'user_name' => $GLOBALS['phpgw']->common->grab_owner_name($id), + 'lang_user_url_statustext' => lang('edit user') + ); + } + + $data['lang_confirm_msg'] = lang('the users bellow are still members of group %1',$group_name) . '. ' + . lang('they must be removed before you can continue'); + $data['lang_remove_user'] = lang('Remove all users from this group ?'); + } + + $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data)); + } + + function delete_user() + { + if ($GLOBALS['phpgw']->acl->check('account_access',32,'admin') || $GLOBALS['phpgw_info']['user']['account_id'] == $_GET['account_id']) + { + $this->list_users(); + return False; + } + + unset($GLOBALS['phpgw_info']['flags']['noheader']); + unset($GLOBALS['phpgw_info']['flags']['nonavbar']); + $GLOBALS['phpgw']->common->phpgw_header(); + + $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); + $t->set_file( + Array( + 'form' => 'delete_account.tpl' + ) + ); + $var = Array( + 'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.boaccounts.delete_user'), + 'account_id' => $_GET['account_id'] + ); + + // the account can have special chars/white spaces, if it is a ldap dn + $account_id = rawurlencode($_GET['account_id']); + + // Find out who the new owner is of the deleted users records... + $users = $GLOBALS['phpgw']->accounts->get_list('accounts'); + $c_users = count($users); + $str = ''; + for($i=0;$i<$c_users;$i++) + { + $str .= ''."\n"; + } + $var['lang_new_owner'] = lang('Who would you like to transfer ALL records owned by the deleted user to?'); + $var['new_owner_select'] = ''."\n"; + $var['cancel'] = lang('cancel'); + $var['delete'] = lang('delete'); + $t->set_var($var); + $t->pparse('out','form'); + } + function group_manager($cd='',$account_id='') { if ($GLOBALS['phpgw']->acl->check('group_access',16,'admin')) @@ -801,264 +1017,6 @@ } } - function create_edit_user($_account_id,$_userData='',$_errors='') - { - $sbox = createobject('phpgwapi.sbox'); - - unset($GLOBALS['phpgw_info']['flags']['noheader']); - unset($GLOBALS['phpgw_info']['flags']['nonavbar']); - $GLOBALS['phpgw']->common->phpgw_header(); - - $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL); - $t->set_unknowns('remove'); - - if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes'] && ($GLOBALS['phpgw_info']['server']['account_repository'] == 'ldap')) - { - $t->set_file(array('account' => 'account_form_ldap.tpl')); - } - else - { - $t->set_file(array('account' => 'account_form.tpl')); - } - $t->set_block('account','form','form'); - $t->set_block('account','form_passwordinfo','form_passwordinfo'); - $t->set_block('account','form_buttons_','form_buttons_'); - $t->set_block('account','link_row','link_row'); - - print_debug('Type : '.gettype($_userData).'
_userData(size) = "'.$_userData.'"('.strlen($_userData).')'); - if (is_array($_userData)) - { - $userData = Array(); - $userData=$_userData; - @reset($userData['account_groups']); - while (list($key, $value) = @each($userData['account_groups'])) - { - $userGroups[$key]['account_id'] = $value; - } - - $account = CreateObject('phpgwapi.accounts'); - $allGroups = $account->get_list('groups'); - } - elseif(is_string($_userData) && $_userData=='') - { - if($_account_id) - { - $account = CreateObject('phpgwapi.accounts',intval($_account_id),'u'); - $userData = $account->read_repository(); - $userGroups = $account->membership($_account_id); - } - else - { - $account = CreateObject('phpgwapi.accounts'); - $userData = Array(); - $userData['status'] = 'A'; - $userGroups = Array(); - } - $allGroups = $account->get_list('groups'); - - if ($userData['expires'] == -1) - { - $userData['account_expires_month'] = 0; - $userData['account_expires_day'] = 0; - $userData['account_expires_year'] = 0; - } - else - { - /* Change this to be an admin/setup setting. For now, default to expire one week from today. */ - $time_var = time() + (60*60*24*7); - $userData['account_expires_month'] = date('m',$userData['expires'] > 0 ? $userData['expires'] : $time_var); - $userData['account_expires_day'] = date('d',$userData['expires'] > 0 ? $userData['expires'] : $time_var); - $userData['account_expires_year'] = date('Y',$userData['expires'] > 0 ? $userData['expires'] : $time_var); - } - } - $page_params['menuaction'] = 'admin.boaccounts.'.($_account_id?'edit':'add').'_user'; - if($_account_id) - { - $page_params['account_id'] = $_account_id; - $page_params['old_loginid'] = rawurlencode($userData['account_lid']); - } - - $var = Array( - 'form_action' => $GLOBALS['phpgw']->link('/index.php',$page_params), - 'cancel_action' => $GLOBALS['phpgw']->link('/admin/index.php'), - 'error_messages' => (!$_errors?'':'
'.$GLOBALS['phpgw']->common->error_list($_errors).'
'), - 'lang_action' => ($_account_id?lang('Edit user account'):lang('Add new account')), - 'lang_loginid' => lang('LoginID'), - 'lang_account_active' => lang('Account active'), - 'lang_password' => lang('Password'), - 'lang_reenter_password' => lang('Re-Enter Password'), - 'lang_lastname' => lang('Last Name'), - 'lang_groups' => lang('Groups'), - 'lang_expires' => lang('Expires'), - 'lang_firstname' => lang('First Name'), - 'lang_button' => ($_account_id?lang('Save'):lang('Add')), - 'lang_cancel' => lang('Cancel') - /* 'lang_file_space' => lang('File Space') */ - ); - $t->set_var($var); - $t->parse('form_buttons','form_buttons_',True); - - if ($GLOBALS['phpgw_info']['server']['ldap_extra_attributes']) { - $lang_homedir = lang('home directory'); - $lang_shell = lang('login shell'); - $homedirectory = ''; - $loginshell = ''; - } - else - { - $lang_homedir = ''; - $lang_shell = ''; - $homedirectory = ''; - $loginshell = ''; - } - - $_y = $sbox->getyears('account_expires_year',$userData['account_expires_year'],date('Y'),date('Y')+10); - $_m = $sbox->getmonthtext('account_expires_month',$userData['account_expires_month']); - $_d = $sbox->getdays('account_expires_day',$userData['account_expires_day']); - - $account_file_space = ''; - /* - if (!$userData['file_space']) - { - $userData['file_space'] = $GLOBALS['phpgw_info']['server']['vfs_default_account_size_number'] . "-" . $GLOBALS['phpgw_info']['server']['vfs_default_account_size_type']; - } - $file_space_array = explode ('-', $userData['file_space']); - $account_file_space_number = $file_space_array[0]; - $account_file_space_type = $file_space_array[1]; - $account_file_space_type_selected[$account_file_space_type] = ' selected'; - - $account_file_space = ''; - $account_file_space_select =''; - - $var = Array( - 'lang_file_space' => 'File space', - 'account_file_space' => $account_file_space, - 'account_file_space_select' => $account_file_space_select - ); - $t->set_var($var); - */ - - $var = Array( - 'input_expires' => $GLOBALS['phpgw']->common->dateformatorder($_y,$_m,$_d,True), - 'lang_never' => lang('Never'), - 'account_lid' => '', - 'lang_homedir' => $lang_homedir, - 'lang_shell' => $lang_shell, - 'homedirectory' => $homedirectory, - 'loginshell' => $loginshell, - 'account_status' => '', - 'account_firstname' => '', - 'account_lastname' => '', - 'account_passwd' => $account_passwd, - 'account_passwd_2' => $account_passwd_2, - 'account_file_space' => $account_file_space - ); - - if($userData['expires'] == -1) - { - $var['never_expires'] = ''; - } - else - { - $var['never_expires'] = ''; - } - - $t->set_var($var); - $t->parse('password_fields','form_passwordinfo',True); - -// $allAccounts; -// $userGroups; - - $groups_select = ''; - reset($allGroups); - while (list($key,$value) = each($allGroups)) - { - $groups_select .= ''."\n"; - } - - /* create list of available apps */ - $i = 0; - - $apps = CreateObject('phpgwapi.applications',$_account_id); - $db_perms = $apps->read_account_specific(); - - @reset($GLOBALS['phpgw_info']['apps']); - $availableApps = $GLOBALS['phpgw_info']['apps']; - @asort($availableApps); - @reset($availableApps); - while (list($key,$application) = each($availableApps)) - { - if ($application['enabled'] && $application['status'] != 3) - { - $perm_display[$i]['appName'] = $key; - $perm_display[$i]['translatedName'] = $application['title']; - $i++; - } - } - - /* create apps output */ - $appRightsOutput = ''; -// @reset($perm_display); - for ($i=0;$i%s', - $perm_display[$i]['translatedName'], - $perm_display[$i]['appName'], - ($userData['account_permissions'][$perm_display[$i]['appName']] || $db_perms[$perm_display[$i]['appName']]?' checked':'')); - } - - $i++; - - if ($perm_display[$i]['translatedName']) - { - $part2 = sprintf('%s', - $perm_display[$i]['translatedName'], - $perm_display[$i]['appName'], - ($userData['account_permissions'][$perm_display[$i]['appName']] || $db_perms[$perm_display[$i]['appName']]?' checked':'')); - } - else - { - $part2 = ' '; - } - - $appRightsOutput .= ''.$part1.$part2.''; - } - - $var = Array( - 'groups_select' => ''."\n", - 'permissions_list' => $appRightsOutput - ); - $t->set_var($var); - - // create the menu on the left, if needed -// $menuClass = CreateObject('admin.uimenuclass'); - // This is now using ExecMethod() - $t->set_var('rows',ExecMethod('admin.uimenuclass.createHTMLCode','edit_user')); - - echo $t->fp('out','form'); - } - function edit_group_managers($group_info,$_errors='') { if ($GLOBALS['phpgw']->acl->check('group_access',16,'admin')) diff --git a/admin/templates/default/account_form.tpl b/admin/templates/default/account_form.tpl deleted file mode 100644 index cb2b7a6ecb..0000000000 --- a/admin/templates/default/account_form.tpl +++ /dev/null @@ -1,79 +0,0 @@ - -{error_messages} - -
-
- - - - - -
- {rows} - - - - - - - - - - - - - - - - - - {password_fields} - - - - - - - - - {permissions_list} - {form_buttons} -
{lang_action}
{lang_loginid}{account_lid} {lang_account_active}:{account_status}
{lang_firstname}{account_firstname} {lang_lastname}{account_lastname} 
{lang_groups}{groups_select} 
{lang_expires}{input_expires}  {lang_never} {never_expires}
-
-
-
- - - - - {lang_password} - - {lang_reenter_password} - - - - - - - - -
- - - - - - - {lang_lastlogin} - {account_lastlogin} - - {lang_lastloginfrom} - {account_lastloginfrom} - - - - - -  {row_text} - - diff --git a/admin/templates/default/app_data.xsl b/admin/templates/default/app_data.xsl index 4ed524c4ba..2565794b25 100644 --- a/admin/templates/default/app_data.xsl +++ b/admin/templates/default/app_data.xsl @@ -20,6 +20,9 @@ + + + diff --git a/admin/templates/default/users.xsl b/admin/templates/default/users.xsl index 9e346b36cb..629f103900 100644 --- a/admin/templates/default/users.xsl +++ b/admin/templates/default/users.xsl @@ -5,8 +5,8 @@ - - + + @@ -133,10 +133,10 @@ - + - - + +
@@ -148,47 +148,87 @@
- + + + + + - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + - - + + + + + - - + + + + - @@ -196,10 +236,10 @@ - + - @@ -209,7 +249,9 @@
- - - - +
+ + + + + + + +
-
+
- + + + + + + + +
+
- - - + +
 
+
- + +
- + + + @@ -221,6 +263,8 @@ + + @@ -237,7 +281,7 @@ - + @@ -248,15 +292,5 @@ - - - - - - - {$img_name} - - -