Commit a64c51d9 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Remove ranking info from stats area (bug #620825)


Signed-off-by: default avatarRichard Mansfield <richardm@catalyst.net.nz>
parent 863a1bc8
......@@ -195,9 +195,6 @@ $string['statsmaxquotaused'] = 'Has used about %s of disk quota (most is <a href
$string['groupcountsbytype'] = 'Number of groups by Group Type';
$string['groupcountsbyjointype'] = 'Number of groups by Access Type';
$string['blockcountsbytype'] = 'Most frequently used blocks in Portfolio Views:';
$string['Rank'] = 'Rank';
$string['registrationrankdescription'] = 'Rank of this site when compared against all other sites that have regsitered and are sending weekly updates to mahara.org';
$string['rankingsupdated'] = 'Rankings last updated: %s';
$string['uptodate'] = 'up to date';
$string['latestversionis'] = 'latest version is <a href="%s">%s</a>';
$string['viewsbytype'] = 'Views by Type';
......
......@@ -2143,5 +2143,9 @@ function xmldb_core_upgrade($oldversion=0) {
}
}
if ($oldversion < 2010082000) {
delete_records_select('config', "field IN ('usersrank', 'groupsrank', 'viewsrank')");
}
return $status;
}
......@@ -2379,9 +2379,6 @@ function cron_send_registration_data() {
}
else {
set_config('registration_lastsent', time());
set_config('usersrank', $data->usersrank);
set_config('groupsrank', $data->groupsrank);
set_config('viewsrank', $data->viewsrank);
}
}
......
......@@ -187,11 +187,6 @@ function site_data_current() {
'users' => count_records_select('usr', 'id > 0 AND deleted = 0'),
'groups' => count_records('group', 'deleted', 0),
'views' => count_records_select('view', 'owner != 0 OR owner IS NULL'),
'rank' => array(
'users' => get_config('usersrank'),
'groups' => get_config('groupsrank'),
'views' => get_config('viewsrank'),
),
);
}
......@@ -253,8 +248,6 @@ function site_statistics($full=false) {
}
}
$data['strrankingsupdated'] = get_string('rankingsupdated', 'admin', date('Y-m-d H:i', get_config('registration_lastsent')));
return($data);
}
......
......@@ -28,7 +28,7 @@
defined('INTERNAL') || die();
$config = new StdClass;
$config->version = 2010081101;
$config->version = 2010082000;
$config->release = '1.3.0beta5dev';
$config->minupgradefrom = 2008040200;
$config->minupgraderelease = '1.0.0 (release tag 1.0.0_RELEASE)';
......
......@@ -6,25 +6,21 @@
<div class="site-stats-table">
<div><strong>{str tag=siteinstalled section=admin}:</strong> {$sitedata.installdate}</div>
{if $sitedata.users}
<div><strong>{str tag=users}:</strong> {$sitedata.users}{if $sitedata.rank.users} ({str tag=Rank section=admin}: {$sitedata.rank.users}*){/if}<br />
<div><strong>{str tag=users}:</strong> {$sitedata.users}<br />
{str tag=activeusers section=admin}: {$sitedata.usersloggedin}</div>
{/if}
{if $sitedata.groups}
<div><strong>{str tag=groups}:</strong> {$sitedata.groups}{if $sitedata.rank.groups} ({str tag=Rank section=admin}: {$sitedata.rank.groups}*){/if}</br />
<div><strong>{str tag=groups}:</strong> {$sitedata.groups}</br />
{$sitedata.strgroupmemberaverage}</div>
{/if}
{if $sitedata.views}
<div><strong>{str tag=views}:</strong> {$sitedata.views}{if $sitedata.rank.views} ({str tag=Rank section=admin}: {$sitedata.rank.views}*){/if}<br />
<div><strong>{str tag=views}:</strong> {$sitedata.views}<br />
{$sitedata.strviewsperuser}</div>
{/if}
{if $sitedata.rank.users}
<div>{$sitedata.strrankingsupdated}</div>
{/if}
<div><strong>{str tag=databasesize section=admin}:</strong> {$sitedata.dbsize|display_size}</div>
{if $sitedata.diskusage}
<div><strong>{str tag=diskusage section=admin}:</strong> {$sitedata.diskusage|display_size}</div>
{/if}
<div><strong>{str tag=maharaversion section=admin}:</strong> {$sitedata.release}{if $sitedata.strlatestversion} ({$sitedata.strlatestversion|clean_html|safe}){/if}</div>
<div><strong>{str tag=Cron section=admin}:</strong> {if $sitedata.cronrunning}{str tag=runningnormally section=admin}{else}{str tag=cronnotrunning section=admin}{/if}</div>
{if $sitedata.rank.users}<div class="s dull fr">* {str tag=registrationrankdescription section=admin}</div>{/if}
</div>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment