aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-25 03:00:05 -0800
committerfriendica <info@friendica.com>2013-11-25 03:00:05 -0800
commitcf3e6a34aee18126c299d2028e0105487afaa49f (patch)
tree367b59edce9cb3e1083903994492234268100941 /mod
parentc0f2bc436c3fc53b48a588edbe766312fbcdc278 (diff)
parent421cacfc8d968f981e6c3420017910c3a8d047ab (diff)
downloadvolse-hubzilla-cf3e6a34aee18126c299d2028e0105487afaa49f.tar.gz
volse-hubzilla-cf3e6a34aee18126c299d2028e0105487afaa49f.tar.bz2
volse-hubzilla-cf3e6a34aee18126c299d2028e0105487afaa49f.zip
Merge pull request #214 from tuscanhobbit/master
admin user table now shows the channel list and ID, minor changes to admin summary table
Diffstat (limited to 'mod')
-rw-r--r--mod/admin.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/mod/admin.php b/mod/admin.php
index 5a3ec48f7..031fe7852 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -474,7 +474,7 @@ function admin_page_hubloc(&$a) {
'$title' => t('Administration'),
'$page' => t('Server'),
'$queues' => $queues,
- '$accounts' => $accounts,
+ //'$accounts' => $accounts, /*$accounts is empty here*/
'$pending' => Array( t('Pending registrations'), $pending),
'$plugins' => Array( t('Active plugins'), $a->plugins )
));
@@ -649,7 +649,10 @@ function admin_page_users(&$a){
if($_REQUEST['order'] === 'expires')
$order = " order by account_expires desc ";
- $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, `account_service_class`, ( account_flags & %d ) > 0 as `blocked` FROM `account` where true $serviceclass $order limit %d , %d ",
+ $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, " . "`account_service_class`, ( account_flags & %d ) > 0 as `blocked`, " .
+ "(SELECT GROUP_CONCAT( ch.channel_address SEPARATOR ' ') FROM channel as ch " .
+ "WHERE ch.channel_account_id = ac.account_id) as `channels` " .
+ "FROM account as ac where true $serviceclass $order limit %d , %d ",
intval(ACCOUNT_BLOCKED),
intval($a->pager['start']),
intval($a->pager['itemspage'])
@@ -689,7 +692,7 @@ function admin_page_users(&$a){
'$unblock' => t('Unblock'),
'$h_users' => t('Users'),
- '$th_users' => array( t('Email'), t('Register date'), t('Last login'), t('Expires'), t('Service Class')),
+ '$th_users' => array( t('ID'), t('Email'), t('All Channels'), t('Register date'), t('Last login'), t('Expires'), 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?'),