diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-03-12 02:35:18 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-03-12 02:35:18 +0000 |
| commit | fbc5260995866c280fbc48bfb7899836f46136f4 (patch) | |
| tree | 61987ccddfa881db07d8f730504d554d062b9e07 | |
| parent | dd45daaad8637f72aa9d0f927f89e637783fdbf8 (diff) | |
| download | volse-hubzilla-fbc5260995866c280fbc48bfb7899836f46136f4.tar.gz volse-hubzilla-fbc5260995866c280fbc48bfb7899836f46136f4.tar.bz2 volse-hubzilla-fbc5260995866c280fbc48bfb7899836f46136f4.zip | |
Get admin/users mostly working. Still need to associate channels with accounts.
| -rw-r--r-- | mod/admin.php | 20 | ||||
| -rw-r--r-- | view/tpl/admin_users.tpl | 7 |
2 files changed, 9 insertions, 18 deletions
diff --git a/mod/admin.php b/mod/admin.php index aa3d7b294..e88936cf4 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -566,20 +566,9 @@ function admin_page_users(&$a){ // FIXME this is borked since there is no more user table - $users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date` - FROM - (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid` - FROM `item` - WHERE `item`.`type` = 'wall' - GROUP BY `item`.`uid`) AS `lastitem` - RIGHT OUTER JOIN `user` ON `user`.`uid` = `lastitem`.`uid`, - `contact` - WHERE - `user`.`uid` = `contact`.`uid` - AND `user`.`verified` =1 - AND `contact`.`self` =1 - ORDER BY `contact`.`name` LIMIT %d, %d - ", +// $users = q("SELECT `account_email` FROM `account` +// ", + $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_service_class` FROM `account`", intval($a->pager['start']), intval($a->pager['itemspage']) ); @@ -591,6 +580,7 @@ function admin_page_users(&$a){ t('Community/Celebrity Account'), t('Automatic Friend Account') ); + $e['page_flags'] = $accounts[$e['page-flags']]; $e['register_date'] = relative_date($e['register_date']); $e['login_date'] = relative_date($e['login_date']); @@ -617,7 +607,7 @@ function admin_page_users(&$a){ '$unblock' => t('Unblock'), '$h_users' => t('Users'), - '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account') ), + '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account'), t('Service Class')), '$confirm_delete_multi' => t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'), '$confirm_delete' => t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'), diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 727030f5d..b8822175c 100644 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -66,11 +66,12 @@ <tr> <td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td> <td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td> - <td class='email'>$u.email</td> - <td class='register_date'>$u.register_date</td> - <td class='login_date'>$u.login_date</td> + <td class='email'>$u.account_email</td> + <td class='register_date'>$u.account_created</td> + <td class='login_date'>$u.account_lastlog</td> <td class='lastitem_date'>$u.lastitem_date</td> <td class='login_date'>$u.page_flags</td> + <td class='service_class'>$u.account_service_class</td> <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td> <td class="tools"> <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a> |