From 4b3ff10393a5bd9127a4e65029c1e706aff139d8 Mon Sep 17 00:00:00 2001
From: root <root@www.cacert.org>
Date: Tue, 8 Apr 2008 20:16:47 +0000
Subject: [PATCH] Added CATS statistics

---
 www/stats.php | 63 +++++++++++++++++++++++++++++----------------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/www/stats.php b/www/stats.php
index 4311971..f7231c7 100644
--- a/www/stats.php
+++ b/www/stats.php
@@ -54,12 +54,17 @@
     <td class="DataTD"><?=number_format($certs)?></td>
   </tr>
 <?
-	$certs = tc(mysql_query("select count(`id`) as `count` from `domaincerts` where `revoked`=0 and `expire`>NOW()"));
-	$certs += tc(mysql_query("select count(`id`) as `count` from `emailcerts` where `revoked`=0 and `expire`>NOW()"));
-	$certs += tc(mysql_query("select count(`id`) as `count` from `gpg` where `expire`<=NOW()"));
-	$certs += tc(mysql_query("select count(`id`) as `count` from `orgdomaincerts` where `revoked`=0 and `expire`>NOW()"));
-	$certs += tc(mysql_query("select count(`id`) as `count` from `orgemailcerts` where `revoked`=0 and `expire`>NOW()"));
-	$totalassurers = mysql_num_rows(mysql_query("select `to` from notary group by `to` having sum(`points`) >= 100"));
+      $certs = tc(mysql_query("select count(`id`) as `count` from `domaincerts` where `revoked`=0 and `expire`>NOW()"));
+      $certs += tc(mysql_query("select count(`id`) as `count` from `emailcerts` where `revoked`=0 and `expire`>NOW()"));
+      $certs += tc(mysql_query("select count(`id`) as `count` from `gpg` where `expire`<=NOW()"));
+      $certs += tc(mysql_query("select count(`id`) as `count` from `orgdomaincerts` where `revoked`=0 and `expire`>NOW()"));
+      $certs += tc(mysql_query("select count(`id`) as `count` from `orgemailcerts` where `revoked`=0 and `expire`>NOW()"));
+      $assurercandidates = tc(mysql_query("select count(*) as `count` from `users` where ".
+                                    "not exists(select 1 from `cats_passed` as `cp`, `cats_variant` as `cv` where `cp`.`user_id`=`users`.`id` and `cp`.`variant_id`=`cv`.`id` and `cv`.`type_id`=1) and ".
+                                    "(select sum(`points`) from `notary` where `to`=`users`.`id`) >= 100"));
+      $realassurers = tc(mysql_query("select count(*) as `count` from `users` where ".
+                                    "exists(select 1 from `cats_passed` as `cp`, `cats_variant` as `cv` where `cp`.`user_id`=`users`.`id` and `cp`.`variant_id`=`cv`.`id` and `cv`.`type_id`=1) and ".
+                                    "(select sum(`points`) from `notary` where `to`=`users`.`id`) >= 100"));
 ?>
   <tr>
     <td class="DataTD"><?=_("Valid Certificates")?>:</td>
@@ -78,8 +83,12 @@
     <td class="DataTD"><?=number_format(mysql_num_rows(mysql_query("select `to` from `notary` group by `to` having sum(`points`) >= 50 and sum(`points`) < 100")))?></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_("Assurers")?>:</td>
-    <td class="DataTD"><?=number_format($totalassurers)?></td>
+    <td class="DataTD"><?=_("Assurer Candidates")?>:</td>
+    <td class="DataTD"><?=number_format($assurercandidates)?></td>
+  </tr>
+  <tr>
+    <td class="DataTD"><?=_("Assurers with test")?>:</td>
+    <td class="DataTD"><?=number_format($realassurers)?></td>
   </tr>
   <tr><? $drow = mysql_fetch_assoc(mysql_query("select sum(`points`) as `points` from `notary`")); ?>
     <td class="DataTD"><?=_("Points Issued")?>:</td>
@@ -98,15 +107,15 @@
     <td class="DataTD"><b><?=_("New Certificates")?></b>
   </tr>
 <? for($i = 0; $i < 12; $i++) {
-	$date = date("Y-m", mktime(0,0,0,date("m") - $i,1,date("Y")));
-	$totalusers += $users = tc(mysql_query("select count(`id`) as `count` from `users` where `created` like '$date%' and `verified`=1"));
-	$totassurers += $assurers = mysql_num_rows(mysql_query("select `to` from `notary` where `when` like '$date%' and `method`!='Administrative Increase' group by `to` having sum(`points`) >= 100"));
-	$certs = tc(mysql_query("select count(`id`) as `count` from `domaincerts` where `created` like '$date%'"));
-	$certs += tc(mysql_query("select count(`id`) as `count` from `emailcerts` where `created` like '$date%'"));
-	$certs += tc(mysql_query("select count(`id`) as `count` from `gpg` where `issued` like '$date%'"));
-	$certs += tc(mysql_query("select count(`id`) as `count` from `orgdomaincerts` where `created` like '$date%'"));
-	$certs += tc(mysql_query("select count(`id`) as `count` from `orgemailcerts` where `created` like '$date%'"));
-	$totalcerts += $certs;
+    $date = date("Y-m", mktime(0,0,0,date("m") - $i,1,date("Y")));
+    $totalusers += $users = tc(mysql_query("select count(`id`) as `count` from `users` where `created` like '$date%' and `verified`=1"));
+    $totassurers += $assurers = mysql_num_rows(mysql_query("select `to` from `notary` where `when` like '$date%' and `method`!='Administrative Increase' group by `to` having sum(`points`) >= 100"));
+    $certs = tc(mysql_query("select count(`id`) as `count` from `domaincerts` where `created` like '$date%'"));
+    $certs += tc(mysql_query("select count(`id`) as `count` from `emailcerts` where `created` like '$date%'"));
+    $certs += tc(mysql_query("select count(`id`) as `count` from `gpg` where `issued` like '$date%'"));
+    $certs += tc(mysql_query("select count(`id`) as `count` from `orgdomaincerts` where `created` like '$date%'"));
+    $certs += tc(mysql_query("select count(`id`) as `count` from `orgemailcerts` where `created` like '$date%'"));
+    $totalcerts += $certs;
 ?>
   <tr>
     <td class="DataTD"><?=$date?></td>
@@ -134,16 +143,16 @@
     <td class="DataTD"><b><?=_("New Certificates")?></b>
   </tr>
 <?
-	$totalcerts = $totalusers = $totassurers = 0;
-	for($i = date("Y"); $i >= 2002; $i--) {
-	$totalusers += $users = tc(mysql_query("select count(`id`) as `count` from `users` where `created` like '$i%' and `verified`=1"));
-	$totassurers += $assurers = mysql_num_rows(mysql_query("select `to` from `notary` where `when` like '$i%' and `method`!='Administrative Increase' group by `to` having sum(`points`) >= 100"));
-	$certs = tc(mysql_query("select count(`id`) as `count` from `domaincerts` where `created` like '$i%'"));
-	$certs += tc(mysql_query("select count(`id`) as `count` from `emailcerts` where `created` like '$i%'"));
-	$certs += tc(mysql_query("select count(`id`) as `count` from `gpg` where `issued` like '$i%'"));
-	$certs += tc(mysql_query("select count(`id`) as `count` from `orgdomaincerts` where `created` like '$i%'"));
-	$certs += tc(mysql_query("select count(`id`) as `count` from `orgemailcerts` where `created` like '$i%'"));
-	$totalcerts += $certs;
+    $totalcerts = $totalusers = $totassurers = 0;
+    for($i = date("Y"); $i >= 2002; $i--) {
+    $totalusers += $users = tc(mysql_query("select count(`id`) as `count` from `users` where `created` like '$i%' and `verified`=1"));
+    $totassurers += $assurers = mysql_num_rows(mysql_query("select `to` from `notary` where `when` like '$i%' and `method`!='Administrative Increase' group by `to` having sum(`points`) >= 100"));
+    $certs = tc(mysql_query("select count(`id`) as `count` from `domaincerts` where `created` like '$i%'"));
+    $certs += tc(mysql_query("select count(`id`) as `count` from `emailcerts` where `created` like '$i%'"));
+    $certs += tc(mysql_query("select count(`id`) as `count` from `gpg` where `issued` like '$i%'"));
+    $certs += tc(mysql_query("select count(`id`) as `count` from `orgdomaincerts` where `created` like '$i%'"));
+    $certs += tc(mysql_query("select count(`id`) as `count` from `orgemailcerts` where `created` like '$i%'"));
+    $totalcerts += $certs;
 ?>
   <tr>
     <td class="DataTD"><?=$i?></td>