Commit 65fa603f authored by Dries's avatar Dries
Browse files

- Removed the user IDs from the users administration table and added a 'Member for' column.

parent cf1224d5
...@@ -1663,14 +1663,13 @@ function user_admin_role() { ...@@ -1663,14 +1663,13 @@ function user_admin_role() {
function user_admin_account() { function user_admin_account() {
$header = array( $header = array(
array('data' => t('ID'), 'field' => 'u.uid'),
array('data' => t('Username'), 'field' => 'u.name'), array('data' => t('Username'), 'field' => 'u.name'),
array('data' => t('Status'), 'field' => 'u.status'), array('data' => t('Status'), 'field' => 'u.status'),
array('data' => t('Roles')), array('data' => t('Roles')),
array('data' => t('Last access'), 'field' => 'u.login', 'sort' => 'desc'), array('data' => t('Member for'), 'field' => 'u.created', 'sort' => 'desc'),
t('Operations') t('Operations')
); );
$sql = 'SELECT u.uid, u.name, u.status, u.login, u.changed FROM {users} u WHERE uid != 0'; $sql = 'SELECT u.uid, u.name, u.status, u.created, u.login FROM {users} u WHERE uid != 0';
$sql .= tablesort_sql($header); $sql .= tablesort_sql($header);
$result = pager_query($sql, 50); $result = pager_query($sql, 50);
...@@ -1684,13 +1683,13 @@ function user_admin_account() { ...@@ -1684,13 +1683,13 @@ function user_admin_account() {
$roles[] = $role->name; $roles[] = $role->name;
} }
$rows[] = array($account->uid, format_name($account), $status[$account->status], implode(', ', $roles), format_date($account->changed, 'small'), l(t('edit'), "user/$account->uid/edit", array(), $destination)); $rows[] = array(format_name($account), $status[$account->status], implode(', ', $roles), format_interval(time() - $account->created), l(t('edit'), "user/$account->uid/edit", array(), $destination));
} }
$pager = theme('pager', NULL, 50, 0, tablesort_pager()); $pager = theme('pager', NULL, 50, 0, tablesort_pager());
if (!empty($pager)) { if (!empty($pager)) {
$rows[] = array(array('data' => $pager, 'colspan' => '6')); $rows[] = array(array('data' => $pager, 'colspan' => '5'));
} }
return theme('table', $header, $rows); return theme('table', $header, $rows);
} }
......
...@@ -1663,14 +1663,13 @@ function user_admin_role() { ...@@ -1663,14 +1663,13 @@ function user_admin_role() {
function user_admin_account() { function user_admin_account() {
$header = array( $header = array(
array('data' => t('ID'), 'field' => 'u.uid'),
array('data' => t('Username'), 'field' => 'u.name'), array('data' => t('Username'), 'field' => 'u.name'),
array('data' => t('Status'), 'field' => 'u.status'), array('data' => t('Status'), 'field' => 'u.status'),
array('data' => t('Roles')), array('data' => t('Roles')),
array('data' => t('Last access'), 'field' => 'u.login', 'sort' => 'desc'), array('data' => t('Member for'), 'field' => 'u.created', 'sort' => 'desc'),
t('Operations') t('Operations')
); );
$sql = 'SELECT u.uid, u.name, u.status, u.login, u.changed FROM {users} u WHERE uid != 0'; $sql = 'SELECT u.uid, u.name, u.status, u.created, u.login FROM {users} u WHERE uid != 0';
$sql .= tablesort_sql($header); $sql .= tablesort_sql($header);
$result = pager_query($sql, 50); $result = pager_query($sql, 50);
...@@ -1684,13 +1683,13 @@ function user_admin_account() { ...@@ -1684,13 +1683,13 @@ function user_admin_account() {
$roles[] = $role->name; $roles[] = $role->name;
} }
$rows[] = array($account->uid, format_name($account), $status[$account->status], implode(', ', $roles), format_date($account->changed, 'small'), l(t('edit'), "user/$account->uid/edit", array(), $destination)); $rows[] = array(format_name($account), $status[$account->status], implode(', ', $roles), format_interval(time() - $account->created), l(t('edit'), "user/$account->uid/edit", array(), $destination));
} }
$pager = theme('pager', NULL, 50, 0, tablesort_pager()); $pager = theme('pager', NULL, 50, 0, tablesort_pager());
if (!empty($pager)) { if (!empty($pager)) {
$rows[] = array(array('data' => $pager, 'colspan' => '6')); $rows[] = array(array('data' => $pager, 'colspan' => '5'));
} }
return theme('table', $header, $rows); return theme('table', $header, $rows);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment