diff options
| author | friendica <info@friendica.com> | 2013-11-25 03:00:05 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-11-25 03:00:05 -0800 |
| commit | cf3e6a34aee18126c299d2028e0105487afaa49f (patch) | |
| tree | 367b59edce9cb3e1083903994492234268100941 | |
| parent | c0f2bc436c3fc53b48a588edbe766312fbcdc278 (diff) | |
| parent | 421cacfc8d968f981e6c3420017910c3a8d047ab (diff) | |
| download | volse-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
| -rw-r--r-- | mod/admin.php | 9 | ||||
| -rwxr-xr-x | view/tpl/admin_summary.tpl | 20 | ||||
| -rwxr-xr-x | view/tpl/admin_users.tpl | 2 |
3 files changed, 16 insertions, 15 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?'), diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index d3665626f..24cdd57cc 100755 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -14,27 +14,23 @@ <dt>{{$users.0}}</dt> <dd>{{$users.1}}</dd> </dl> - {{foreach $accounts as $p}} + <!-- $accounts is empty + {{foreach $accounts as $p}} <dl> <dt>{{$p.0}}</dt> <dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd> </dl> - {{/foreach}} - - + {{/foreach}} --> <dl> <dt>{{$plugins.0}}</dt> - - {{foreach $plugins.1 as $p}} - <dd>{{$p}}</dd> - {{/foreach}} - + <dd> + {{foreach $plugins.1 as $p}} {{$p}} {{/foreach}} + + </dd> </dl> - <dl> <dt>{{$version.0}}</dt> - <dd>{{$version.1}} - {{$build}}</dt> + <dd>{{$version.1}} - {{$build}}</dd> </dl> - </div> diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 609289013..3549dc5c2 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -63,11 +63,13 @@ <tbody> {{foreach $users as $u}} <tr> + <td class='account_id'>{{$u.account_id}}</td> <td class='email'>{{if $u.blocked}} <i>{{$u.account_email}}</i> {{else}} <strong>{{$u.account_email}}</strong> {{/if}}</td> + <td class='channels'>{{$u.channels}}</td> <td class='register_date'>{{$u.account_created}}</td> <td class='login_date'>{{$u.account_lastlog}}</td> <td class='account_expires'>{{$u.account_expires}}</td> |