Merge pull request #418 from fermionic/reduce-frost-dom-elements

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index 1f53f112daee9fa01f8277367328dd049caac80c..05af01aa41d55052a5ce88ff3c544003a8ff7efd 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -98,7 +98,7 @@ function admin_content(&$a) {
                'plugins'=>     Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
                'themes' =>     Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
                'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"),
-               'update' =>     Array($a->get_baseurl(true)."/admin/update/", t("Software Update") , "update")
+               //'update' =>   Array($a->get_baseurl(true)."/admin/update/", t("Software Update") , "update")
        );
        
        /* get plugins admin page */
@@ -115,8 +115,11 @@ function admin_content(&$a) {
        $aside['logs'] = Array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs");
 
        $t = get_markup_template("admin_aside.tpl");
-       $a->page['aside'] = replace_macros( $t, array(
+       $a->page['aside'] .= replace_macros( $t, array(
                        '$admin' => $aside, 
+                       '$admtxt' => t('Admin'),
+                       '$plugadmtxt' => t('Plugin Features'),
+                       '$logtxt' => t('Logs'),
                        '$h_pending' => t('User registrations waiting for confirmation'),
                        '$admurl'=> $a->get_baseurl(true)."/admin/"
        ));
@@ -180,20 +183,35 @@ function admin_page_summary(&$a) {
                Array( t('Normal Account'), 0),
                Array( t('Soapbox Account'), 0),
                Array( t('Community/Celebrity Account'), 0),
-               Array( t('Automatic Friend Account'), 0)
+               Array( t('Automatic Friend Account'), 0),
+               Array( t('Blog Account'), 0),
+               Array( t('Private Forum'), 0)
        );
+
        $users=0;
        foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; }
 
-       logger('accounts: ' . print_r($accounts,true));
+       logger('accounts: ' . print_r($accounts,true),LOGGER_DATA);
 
        $r = q("SELECT COUNT(id) as `count` FROM `register`");
        $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");
        return replace_macros($t, array(
                '$title' => t('Administration'),
                '$page' => t('Summary'),
+               '$queues' => $queues,
                '$users' => Array( t('Registered users'), $users),
                '$accounts' => $accounts,
                '$pending' => Array( t('Pending registrations'), $pending),
@@ -453,6 +471,9 @@ function admin_page_dbsync(&$a) {
 
        if($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
                set_config('database', 'update_' . intval($a->argv[3]), 'success');
+               $curr = get_config('system','build');
+               if(intval($curr) == intval($a->argv[3]))
+                       set_config('system','build',intval($curr) + 1);
                info( t('Update has been marked successful') . EOL);
                goaway($a->get_baseurl(true) . '/admin/dbsync');
        }