mexon/friendica
1
0
Fork 0
Code Pull requests Activity

add queue totals to admin summary page

Browse source
This commit is contained in:
friendica 2012-05-22 03:44:03 -07:00
parent be64437b14
commit f29f861d25
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mod/admin.php
View file

@ -115,7 +115,7 @@ function admin_content(&$a) {
$aside['logs'] = Array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs"); $aside['logs'] = Array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs");
$t = get_markup_template("admin_aside.tpl"); $t = get_markup_template("admin_aside.tpl");
$a->page['aside'] = replace_macros( $t, array( $a->page['aside'] .= replace_macros( $t, array(
'$admin' => $aside, '$admin' => $aside,
'$h_pending' => t('User registrations waiting for confirmation'), '$h_pending' => t('User registrations waiting for confirmation'),
'$admurl'=> $a->get_baseurl(true)."/admin/" '$admurl'=> $a->get_baseurl(true)."/admin/"
@ -182,6 +182,7 @@ function admin_page_summary(&$a) {
Array( t('Community/Celebrity Account'), 0), Array( t('Community/Celebrity Account'), 0),
Array( t('Automatic Friend Account'), 0) Array( t('Automatic Friend Account'), 0)
); );
$users=0; $users=0;
foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; } foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; }
@ -190,10 +191,22 @@ function admin_page_summary(&$a) {
$r = q("SELECT COUNT(id) as `count` FROM `register`"); $r = q("SELECT COUNT(id) as `count` FROM `register`");
$pending = $r[0]['count']; $pending = $r[0]['count'];
$r = q("select count(*) as total from deliverq where 1");
$deliverq = (($r) ? $r[0]['total'] : 0);
$r = q("select count(*) as total from queue where 1");
$queue = (($r) ? $r[0]['total'] : 0);
// We can do better, but this is a quick queue status
$queues = array( 'label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue );
$t = get_markup_template("admin_summary.tpl"); $t = get_markup_template("admin_summary.tpl");
return replace_macros($t, array( return replace_macros($t, array(
'$title' => t('Administration'), '$title' => t('Administration'),
'$page' => t('Summary'), '$page' => t('Summary'),
'$queues' => $queues,
'$users' => Array( t('Registered users'), $users), '$users' => Array( t('Registered users'), $users),
'$accounts' => $accounts, '$accounts' => $accounts,
'$pending' => Array( t('Pending registrations'), $pending), '$pending' => Array( t('Pending registrations'), $pending),

4
view/admin_summary.tpl
View file

@ -1,6 +1,10 @@
<div id='adminpage'> <div id='adminpage'>
<h1>$title - $page</h1> <h1>$title - $page</h1>
<dl>
<dt>$queues.label</dt>
<dd>$queues.deliverq - $queues.queue</dd>
</dl>
<dl> <dl>
<dt>$pending.0</dt> <dt>$pending.0</dt>
<dd>$pending.1</dt> <dd>$pending.1</dt>