summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-01-13 23:04:03 +0100
committerBenny Baumann <BenBE@geshi.org>2015-01-13 23:04:03 +0100
commit748d87b9e8d45cfba944fd6ba5f4a0f6a98967f0 (patch)
tree515f5656095451f2a077784d76d2e68d5e105a64 /scripts
parented1d1b8880770a613a011668e93664dcd18c3dc7 (diff)
parent0ee9c78f30399241b18f7fa3db52ffa91e7a7c2b (diff)
downloadcacert-devel-748d87b9e8d45cfba944fd6ba5f4a0f6a98967f0.tar.gz
cacert-devel-748d87b9e8d45cfba944fd6ba5f4a0f6a98967f0.tar.xz
cacert-devel-748d87b9e8d45cfba944fd6ba5f4a0f6a98967f0.zip
Merge branch 'bug-1357' into testserver-stable
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/cron/refresh_stats.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/cron/refresh_stats.php b/scripts/cron/refresh_stats.php
index 6890024..006ac6d 100755
--- a/scripts/cron/refresh_stats.php
+++ b/scripts/cron/refresh_stats.php
@@ -138,9 +138,9 @@ 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['aussurers_with_test'] = number_format(assurer_count($startdate, $enddate,1));
+ $stats['assurers_with_test'] = number_format(assurer_count($startdate, $enddate,1));
- $stats['assurer_candidates'] = number_format(assurer_count($startdate, $enddate,0) - $stats['aussurers_with_test']);
+ $stats['assurer_candidates'] = number_format(assurer_count($startdate, $enddate,0) - $stats['assurers_with_test']);
$stats['points_issued'] = number_format(tc(
@@ -299,7 +299,7 @@ function assurer_count($from, $to, $type = 1){
FROM cacert.notary as n
WHERE 1
AND n.`from` != n.`to`
- AND (n.`deleted` = '0000-00-00 00:00:00' OR n.`deleted` >= @a)
+ AND (n.`deleted` = '0000-00-00 00:00:00')
AND n.`when` < @a
$atype
GROUP by n.`to`
@@ -312,7 +312,7 @@ function assurer_count($from, $to, $type = 1){
FROM cacert.notary as n
WHERE 1
AND n.`from` != n.`to`
- AND (n.`deleted` = '0000-00-00 00:00:00' OR n.`deleted` >= @b)
+ AND (n.`deleted` = '0000-00-00 00:00:00')
AND n.`when` < @b
$btype
GROUP by n.`to`