From d503426b3436869b506632723fbad5adff263420 Mon Sep 17 00:00:00 2001
From: root <root@www.cacert.org>
Date: Thu, 2 Dec 2004 22:35:23 +0000
Subject: [PATCH] removed mysql.php

---
 pages/wot/6.php |  6 +++++-
 www/stats.php   | 32 +++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/pages/wot/6.php b/pages/wot/6.php
index a3944b1..486b6c8 100644
--- a/pages/wot/6.php
+++ b/pages/wot/6.php
@@ -27,7 +27,11 @@
   <tr>
     <td class="DataTD" colspan="2" align="left"><b><?=_("PLEASE NOTE: You have already assured this person before! If this is unintentional please DO NOT CONTINUE with this assurance.")?></b></td>
   </tr>
-<? } if($_SESSION['profile']['points'] > 150 && $_SESSION['_config']['pointsalready'] > 0) { ?>
+<? } if($_SESSION['_config']['pointsalready'] > 65) { ?>
+  <tr>
+    <td class="DataTD" colspan="2" align="left"><b><? printf(_("This person already has %s assurance points. Any points you give this person may be rounded down, or they may not even get any points. If you have less then 150 points you will still receive 2 points for assuring them."), $_SESSION['_config']['pointsalready']); ?></b></td>
+  </tr>
+<? } else if($_SESSION['_config']['pointsalready'] > 0) { ?>
   <tr>
     <td class="DataTD" colspan="2" align="left"><b><? printf(_("This person already has %s assurance points."), $_SESSION['_config']['pointsalready']); ?></b></td>
   </tr>
diff --git a/www/stats.php b/www/stats.php
index 4fac899..463ba31 100644
--- a/www/stats.php
+++ b/www/stats.php
@@ -51,60 +51,86 @@
     <td class="DataTD"><?=_("Assurances Made")?>:</td>
     <td class="DataTD"><?=number_format(mysql_num_rows(mysql_query("select * from `notary`")))?></td>
   </tr>
+  <tr>
+    <td class="DataTD"><?=_("Users with Points")?>:</td>
+    <td class="DataTD"><?=number_format(mysql_num_rows(mysql_query("select * from `notary` group by `to`")))?></td>
+  </tr>
+  <tr><? $drow = mysql_fetch_assoc(mysql_query("select sum(`points`) as `points` from `notary`")); ?>
+    <td class="DataTD"><?=_("Points Issued")?>:</td>
+    <td class="DataTD"><?=number_format($drow['points'])?></td>
+  </tr>
 </table>
 <br>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="3" class="title">CAcert.org <?=_("Growth in the last 12 months")?></td>
+    <td colspan="4" class="title">CAcert.org <?=_("Growth in the last 12 months")?></td>
   </tr>
   <tr>
     <td class="DataTD"><b><?=_("Date")?></b>
     <td class="DataTD"><b><?=_("New Users")?></b>
     <td class="DataTD"><b><?=_("New Assurers")?></b>
+    <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 = mysql_num_rows(mysql_query("select * from `users` where `created` like '$date%' and `verified`=1"));
 	$totassurers += $assurers = mysql_num_rows(mysql_query("select * from `notary` where `when` like '$date%' and `method`!='Administrative Increase' group by `to` having sum(`points`) >= 100"));
+	$certs = mysql_num_rows(mysql_query("select * from `domaincerts` where `created` like '$date%'"));
+	$certs += mysql_num_rows(mysql_query("select * from `emailcerts` where `created` like '$date%'"));
+	$certs += mysql_num_rows(mysql_query("select * from `gpg` where `issued` like '$date%'"));
+	$certs += mysql_num_rows(mysql_query("select * from `orgdomaincerts` where `created` like '$date%'"));
+	$certs += mysql_num_rows(mysql_query("select * from `orgemailcerts` where `created` like '$date%'"));
+	$totalcerts += $certs;
 ?>
   <tr>
     <td class="DataTD"><?=$date?></td>
     <td class="DataTD"><?=number_format($users)?></td>
     <td class="DataTD"><?=number_format($assurers)?></td>
+    <td class="DataTD"><?=number_format($certs)?></td>
   </tr>
 <? } ?>
   <tr>
     <td class="DataTD">N/A</td>
     <td class="DataTD"><?=number_format($totalusers)?></td>
     <td class="DataTD"><?=number_format($totassurers)?></td>
+    <td class="DataTD"><?=number_format($totalcerts)?></td>
   </tr>
 </table>
 <br>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
-    <td colspan="3" class="title">CAcert.org <?=_("Growth by year")?></td>
+    <td colspan="4" class="title">CAcert.org <?=_("Growth by year")?></td>
   </tr>
   <tr>
     <td class="DataTD"><b><?=_("Date")?></b>
     <td class="DataTD"><b><?=_("New Users")?></b>
     <td class="DataTD"><b><?=_("New Assurers")?></b>
+    <td class="DataTD"><b><?=_("New Certificates")?></b>
   </tr>
 <?
-	$totalusers = $totassurers = 0;
+	$totalcerts = $totalusers = $totassurers = 0;
 	for($i = date("Y"); $i >= 2002; $i--) {
 	$totalusers += $users = mysql_num_rows(mysql_query("select * from `users` where `created` like '$i%' and `verified`=1"));
 	$totassurers += $assurers = mysql_num_rows(mysql_query("select * from `notary` where `when` like '$i%' and `method`!='Administrative Increase' group by `to` having sum(`points`) >= 100"));
+	$certs = mysql_num_rows(mysql_query("select * from `domaincerts` where `created` like '$i%'"));
+	$certs += mysql_num_rows(mysql_query("select * from `emailcerts` where `created` like '$i%'"));
+	$certs += mysql_num_rows(mysql_query("select * from `gpg` where `issued` like '$i%'"));
+	$certs += mysql_num_rows(mysql_query("select * from `orgdomaincerts` where `created` like '$i%'"));
+	$certs += mysql_num_rows(mysql_query("select * from `orgemailcerts` where `created` like '$i%'"));
+	$totalcerts += $certs;
 ?>
   <tr>
     <td class="DataTD"><?=$i?></td>
     <td class="DataTD"><?=number_format($users)?></td>
     <td class="DataTD"><?=number_format($assurers)?></td>
+    <td class="DataTD"><?=number_format($certs)?></td>
   </tr>
 <? } ?>
   <tr>
     <td class="DataTD">N/A</td>
     <td class="DataTD"><?=number_format($totalusers)?></td>
     <td class="DataTD"><?=number_format($totassurers)?></td>
+    <td class="DataTD"><?=number_format($totalcerts)?></td>
   </tr>
 </table>
 <br>