[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc/class.uiaccounts.inc.php, 1.44
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] admin/inc/class.uiaccounts.inc.php, 1.44 |
|
Date: |
Fri, 25 Jun 2004 10:23:52 +0200 |
Update of /admin/inc
Modified Files:
Branch:
class.uiaccounts.inc.php
date: 2004/06/25 08:23:52; author: fipsfuchs; state: Exp; lines: +48 -139
Log Message:
refactoring of edit_user
new implementation of view_user (xslttpl enabeld)
=====================================================================
Index: admin/inc/class.uiaccounts.inc.php
diff -u admin/inc/class.uiaccounts.inc.php:1.43
admin/inc/class.uiaccounts.inc.php:1.44
--- admin/inc/class.uiaccounts.inc.php:1.43 Wed Jun 23 15:41:39 2004
+++ admin/inc/class.uiaccounts.inc.php Fri Jun 25 08:23:52 2004
@@ -266,8 +266,8 @@
'lang_edit'
=> ($this->bo->check_rights('edit','account_access')?lang('edit'):''),
'lang_edit_statustext' =>
($this->bo->check_rights('edit','account_access')?lang('edit this user'):''),
'lid'
=> (!$account['account_lid']?'':$account['account_lid']),
- 'firstname'
=> (!$account['account_firstname']?'':$account['account_firstname']),
- 'lastname'
=> (!$account['account_lastname']?'':$account['account_lastname']),
+ 'firstname'
=> (!$account['firstname']?'':$account['firstname']),
+ 'lastname'
=> (!$account['lastname']?'':$account['lastname']),
'delete_url'
=>
($this->bo->check_rights('delete','account_access')?$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.delete_user&account_id='
. $account['account_id']):''),
'lang_delete_statustext' =>
($this->bo->check_rights('delete','account_access')?lang('delete this
user'):''),
'lang_delete'
=> ($this->bo->check_rights('delete','account_access')?lang('delete'):'')
@@ -494,37 +494,20 @@
function edit_user()
{
- $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'));
+ $cd =
get_var('cd',array('GET'));
+ $account_id =
get_var('account_id',array('GET','POST'));
+ $values =
get_var('values',array('POST'));
+ $values['old_loginid'] = get_var('old_loginid',
array('GET'));
+ $values['account_groups'] =
get_var('account_groups',array('POST'));
+ $values['account_permissions'] =
get_var('account_permissions',array('POST'));
if ($values['cancel'] || (!$account_id &&
$GLOBALS['phpgw']->acl->check('account_access',4,'admin')) || ($account_id &&
$GLOBALS['phpgw']->acl->check('account_access',16,'admin')))
{
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uiaccounts.list_users');
}
- /*$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));*/
-
if ($values['save'])
{
- if (is_array($account_groups))
- {
- $values['account_groups'] =
$account_groups;
- }
-
- if (is_array($account_permissions))
- {
- $values['account_permissions'] =
$account_permissions;
- }
-
$error = $this->bo->validate_user($values);
if (is_array($error))
@@ -740,155 +723,81 @@
if
($GLOBALS['phpgw']->acl->check('account_access',8,'admin') || !
$_GET['account_id'])
{
$this->list_users();
- return False;
+ 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_unknowns('remove');
- $t->set_file(
- Array(
- 'account' => 'account_form.tpl'
- )
- );
- $t->set_block('account','form','form');
- $t->set_block('account','form_logininfo');
- $t->set_block('account','link_row');
-
- $var = Array(
- 'lang_action' => lang('View user 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_firstname' => lang('First Name'),
- 'lang_lastlogin' => lang('Last login'),
- 'lang_lastloginfrom' => lang('Last login from'),
- 'lang_expires' => lang('Expires')
- );
-
- $t->parse('password_fields','form_logininfo',True);
$account =
CreateObject('phpgwapi.accounts',intval($_GET['account_id']),'u');
$userData = $account->read_repository();
-
- $var['account_lid'] = $userData['account_lid'];
- $var['account_firstname'] = $userData['firstname'];
- $var['account_lastname'] = $userData['lastname'];
-
+
if ($userData['status'])
{
- $var['account_status'] = lang('Enabled');
+ $userData['account_status'] = lang('Enabled');
}
else
{
- $var['account_status'] = '<b>' .
lang('Disabled') . '</b>';
+ $userData['account_status'] = lang('Disabled');
}
-
- // Last login time
+
if ($userData['lastlogin'])
{
- $var['account_lastlogin'] =
$GLOBALS['phpgw']->common->show_date($userData['lastlogin']);
- }
- else
- {
- $var['account_lastlogin'] = lang('Never');
- }
-
- // Last login IP
- if ($userData['lastloginfrom'])
- {
- $var['account_lastloginfrom'] =
$userData['lastloginfrom'];
+ $userData['account_lastlogin'] =
$GLOBALS['phpgw']->common->show_date($userData['lastlogin']);
}
else
{
- $var['account_lastloginfrom'] = lang('Never');
+ $userData['account_lastlogin'] = lang('Never');
}
-
- // Account expires
+
if ($userData['expires'] != -1)
{
- $var['input_expires'] =
$GLOBALS['phpgw']->common->show_date($userData['expires']);
+ $userData['input_expires'] =
$GLOBALS['phpgw']->common->show_date($userData['expires']);
}
else
{
- $var['input_expires'] = lang('Never');
+ $userData['input_expires'] = lang('Never');
}
-
// Find out which groups they are members of
$usergroups =
$account->membership(intval($_GET['account_id']));
- if (gettype($usergroups) != 'array')
+ while (list(,$group) = each($usergroups))
{
- $var['groups_select'] = lang('None');
+ $userData['groups'][] = $group['account_name'];
}
- else
- {
- while (list(,$group) = each($usergroups))
- {
- $group_names[] = $group['account_name'];
- }
- $var['groups_select'] =
implode(',',$group_names);
- }
-
- $account_lastlogin =
$userData['account_lastlogin'];
- $account_lastloginfrom =
$userData['account_lastloginfrom'];
- $account_status = $userData['account_status'];
-
- // create list of available app
- $i = 0;
-
+ //Permissions
$availableApps = $GLOBALS['phpgw_info']['apps'];
+ $apps =
CreateObject('phpgwapi.applications',intval($_GET['account_id']));
+ $perms = array_keys($apps->read_account_specific());
+
@asort($availableApps);
@reset($availableApps);
+ $i = 0;
while ($application = each($availableApps))
{
if ($application[1]['enabled'] &&
$application[1]['status'] != 2)
{
- $perm_display[$i]['appName'] =
$application[0];
- $perm_display[$i]['translatedName'] =
$application[1]['title'];
- $i++;
- }
- }
-
- // create apps output
- $apps =
CreateObject('phpgwapi.applications',intval($_GET['account_id']));
- $db_perms = $apps->read_account_specific();
-
- @reset($db_perms);
-
- for ($i=0;$i<=count($perm_display);$i++)
- {
- if ($perm_display[$i]['translatedName'])
- {
- $part1 =
sprintf("<td>%s</td><td>%s</td>",lang($perm_display[$i]['translatedName']),($_userData['account_permissions'][$perm_display[$i]['appName']]
|| $db_perms[$perm_display[$i]['appName']]?' X':' '));
+ $userData['permissions'][$i]['name'] =
$application[1]['title'];
+ if(in_array($application[1]['name'],
$perms))
+ {
+
$userData['permissions'][$i]['enabled'] = true;
+ }
}
-
$i++;
-
- if ($perm_display[$i]['translatedName'])
- {
- $part2 =
sprintf("<td>%s</td><td>%s</td>",lang($perm_display[$i]['translatedName']),($_userData['account_permissions'][$perm_display[$i]['appName']]
|| $db_perms[$perm_display[$i]['appName']]?' X':' '));
- }
- else
- {
- $part2 = '<td colspan="2"> </td>';
- }
-
- $appRightsOutput .= "<tr
class=\"row_on\">$part1$part2</tr>\n";
}
-
- $var['permissions_list'] = $appRightsOutput;
-
- // create the menu on the left, if needed
-// $menuClass = CreateObject('admin.uimenuclass');
- // This is now using ExecMethod()
- $var['rows'] =
ExecMethod('admin.uimenuclass.createHTMLCode','view_user');
- $t->set_var($var);
- $t->pfp('out','form');
+ // Labels
+/*
+ $userData['l_action'] = lang('View user
account');
+ $userData['l_loginid'] = lang('LoginID');
+ $userData['l_account_active'] = lang('Account
active');
+ $userData['l_password'] = lang('Password');
+ $userData['l_reenter_password'] = lang('Re-Enter
Password'),
+ 'lang_lastname' => lang('Last Name'),
+ 'lang_groups' => lang('Groups'),
+ 'lang_firstname' => lang('First Name'),
+ 'lang_lastlogin' => lang('Last login'),
+ 'lang_lastloginfrom' => lang('Last login from'),
+ 'lang_expires' => lang('Expires')
+ */
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('administration');
+ $GLOBALS['phpgw']->xslttpl->add_file('users');
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('account_view' => $userData));
}
function delete_group()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc/class.uiaccounts.inc.php, 1.44,
nomail <=