diff options
| author | friendica <info@friendica.com> | 2013-03-15 15:38:38 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-03-15 15:38:38 -0700 |
| commit | 104b41164f609765df15aa5595d07dd0b775ed95 (patch) | |
| tree | 612ad669e443ac9ab24bff51fc5f1901b5188ecd /mod | |
| parent | 5a29f511c1fa609f58f50d9148edd1fe77b23d9d (diff) | |
| parent | b48c481b9cb1b1c06634139dc0e6c4c91b83d873 (diff) | |
| download | volse-hubzilla-104b41164f609765df15aa5595d07dd0b775ed95.tar.gz volse-hubzilla-104b41164f609765df15aa5595d07dd0b775ed95.tar.bz2 volse-hubzilla-104b41164f609765df15aa5595d07dd0b775ed95.zip | |
Merge pull request #34 from beardy-unixer/master
Admin panel
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/admin.php | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/mod/admin.php b/mod/admin.php index aa3d7b294..be8575e4e 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -564,22 +564,10 @@ function admin_page_users(&$a){ $a->set_pager_itemspage(100); } -// 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 - ", + +// WEe'll still need to link email addresses to admin/users/channels or some such, but this bit doesn't exist yet. +// That's where we need to be doing last post/channel flags/etc, not here. + $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 +579,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 +606,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('Email'), t('Register date'), t('Last login'), 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?'), |