diff options
| author | Benny Baumann <BenBE@geshi.org> | 2015-01-25 12:57:05 +0100 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2015-01-25 12:57:05 +0100 |
| commit | a50662743047c32946e49bbce20979425667a557 (patch) | |
| tree | bade749dc0d3443c5c4e00f035b7c98cfcff465d | |
| parent | fa68e3ded553ffb0e5808044c457b13c6d6e4d51 (diff) | |
| parent | 6412d38dd2361032b67330def4702ea04b4263a3 (diff) | |
| download | cacert-devel-a50662743047c32946e49bbce20979425667a557.tar.gz cacert-devel-a50662743047c32946e49bbce20979425667a557.tar.xz cacert-devel-a50662743047c32946e49bbce20979425667a557.zip | |
Merge branch 'bug-1357' into testserver-stable
| -rwxr-xr-x | scripts/cron/refresh_stats.php | 6 | ||||
| -rw-r--r-- | www/stats.php | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/scripts/cron/refresh_stats.php b/scripts/cron/refresh_stats.php index 006ac6d..4f18b0b 100755 --- a/scripts/cron/refresh_stats.php +++ b/scripts/cron/refresh_stats.php @@ -138,10 +138,10 @@ function getDataFromLive() { $startdate = date("Y-m-d", mktime(0, 0, 0, 1, 1, 2002)); $enddate = date("Y-m-d", mktime(0, 0, 0, 1, 1, date("Y") + 1)); - $stats['assurers_with_test'] = number_format(assurer_count($startdate, $enddate,1)); - - $stats['assurer_candidates'] = number_format(assurer_count($startdate, $enddate,0) - $stats['assurers_with_test']); + $assurercount= assurer_count($startdate, $enddate,1); + $stats['assurer_with_test'] = number_format($assurercount); + $stats['assurer_candidates'] = number_format(assurer_count($startdate, $enddate,0) - $assurercount); $stats['points_issued'] = number_format(tc( "select sum(greatest(`points`, `awarded`)) as `count` from `notary` diff --git a/www/stats.php b/www/stats.php index 1188f4e..824f19b 100644 --- a/www/stats.php +++ b/www/stats.php @@ -87,7 +87,7 @@ </tr> <tr> <td class="DataTD"><?=_("Assurers with test")?>:</td> - <td class="DataTD"><?=$stats['assurers_with_test'];?></td> + <td class="DataTD"><?=$stats['assurer_with_test'];?></td> </tr> <tr> <td class="DataTD"><?=_("Points Issued")?>:</td> @@ -153,8 +153,9 @@ <br> <div style="text-align: center;font-size: small;"><? - echo _('* user with at least 100 assurance points / assurer with CATS') . '</br>'; - printf(_("Last updated: %s"), date('Y-m-d H:i:s', $stats['timestamp']));?> + echo _('* user with at least 100 assurance points / assurer with CATS') . '</br>'; + echo _('Difference of calculation of assurer between total and running total result from assurers that have been deleted from the system.') . '</br>'; + printf(_("Last updated: %s"), date('Y-m-d H:i:s', $stats['timestamp']));?> </div> <? showfooter(); ?> |