From 06fbc884c512582147289b914dfb20b1a2b1cd1b Mon Sep 17 00:00:00 2001
From: root <root@www.cacert.org>
Date: Thu, 2 Dec 2004 11:34:07 +0000
Subject: [PATCH] bug fixes, added stats page

---
 includes/account.php |  2 +-
 includes/general.php |  8 +++++++
 pages/account/43.php | 41 ++++++++++++++++++++++++++++++++++-
 www/logos.php        | 29 +++++++++++++------------
 www/src-lic.php      |  2 +-
 www/stats.php        | 51 ++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 116 insertions(+), 17 deletions(-)
 create mode 100644 www/stats.php

diff --git a/includes/account.php b/includes/account.php
index 13123d1..ce65077 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -313,7 +313,7 @@
 			if(is_array($adds))
 			foreach($adds as $line)
 			{
-				$line = trim($line);
+				$line = trim(str_replace("\t", " ", $line));
 				$bits = explode(" ", $line);
 				foreach($bits as $bit)
 				{
diff --git a/includes/general.php b/includes/general.php
index 9965758..6489444 100644
--- a/includes/general.php
+++ b/includes/general.php
@@ -473,4 +473,12 @@
 		}
 		return(utf8_decode($data));
 	}
+
+	function screenshot($img)
+	{
+		if(file_exists("../screenshots/".$_SESSION['_config']['language']."/$img"))
+			return("/screenshots/".$_SESSION['_config']['language']."/$img");
+		else
+			return("/screenshots/en/$img");
+	}
 ?>
diff --git a/pages/account/43.php b/pages/account/43.php
index af0fca8..3eae335 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -16,7 +16,9 @@
 	if(intval($_GET['userid']) <= 0)
 	{
 		$email = mysql_escape_string(stripslashes($_POST['email']));
-		$query = "select * from `users` where `email` like '%$email%' limit 100";
+		$query = "select `users`.`id` as `id`, `email`.`email` as `email` from `users`,`email`
+				where `users`.`id`=`email`.`memid` and `email`.`email` like '%$email%'
+				group by `users`.`id` limit 100";
 		$res = mysql_query($query);
 		if(mysql_num_rows($res) > 1) { ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
@@ -139,7 +141,44 @@
     <td class="DataTD"><?=$drow['points']?></td>
   </tr>
 </table>
+<br><?
+	$query = "select * from `email` where `memid`='".$row['id']."' and `deleted`=0 and `hash`=''
+			and `email`!='".$row['email']."'";
+	$dres = mysql_query($query);
+	if(mysql_num_rows($dres) > 0) { ?>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td colspan="5" class="title"><?=_("Alternate Verified Email Addresses")?></td>
+  </tr><?
+	$rc = mysql_num_rows($dres);
+	while($drow = mysql_fetch_assoc($dres))
+	{ ?>
+  <tr>
+    <td class="DataTD"><?=_("Secondary Emails")?>:</td>
+    <td class="DataTD"><?=$drow['email']?></td>
+  </tr>
+<? } ?>
+</table>
+<br><? } ?>
+<?
+	$query = "select * from `domains` where `memid`='".$row['id']."' and `deleted`=0 and `hash`=''";
+	$dres = mysql_query($query);
+	if(mysql_num_rows($dres) > 0) { ?>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td colspan="5" class="title"><?=_("Verified Domains")?></td>
+  </tr><?
+	$rc = mysql_num_rows($dres);
+	while($drow = mysql_fetch_assoc($dres))
+	{ ?>
+  <tr>
+    <td class="DataTD"><?=_("Domain")?>:</td>
+    <td class="DataTD"><?=$drow['domain']?></td>
+  </tr>
+<? } ?>
+</table>
 <br>
+<? } ?>
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
   <tr>
     <td colspan="5" class="title"><?=_("Your Assurance Points")?></td>
diff --git a/www/logos.php b/www/logos.php
index 77dc6c2..0f2c9f6 100644
--- a/www/logos.php
+++ b/www/logos.php
@@ -8,21 +8,22 @@
    using the <a href="http://www.cacert.org">CAcert.org</a> site logo and some gimp
    magic. Send comments or suggestions to <a href="/kontakt/">Chris</a>. Licence: Whatever. I don't care.</p>
 
-<img src="logos/cacert1.png" alt="www.cacert.org" border="0" /><br /><br />
-<img src="logos/cacert-free-certificates2.png" alt="www.cacert.org" border="0" />&nbsp;&nbsp;
-<img src="logos/cacert-free-certificates3.png" alt="www.cacert.org" border="0" />&nbsp;&nbsp;
-<img src="logos/cacert-free-certificates4.png" alt="www.cacert.org" border="0" /><br /><br />
-<img src="logos/cacert-secured3.png" alt="www.cacert.org" border="0" />&nbsp;&nbsp;
-<img src="logos/cacert-secured4.png" alt="www.cacert.org" border="0" />&nbsp;&nbsp;
-<img src="logos/cacert-secured5.png" alt="www.cacert.org" border="0" /><br /><br />
-<img src="logos/cacert-secured7.png" alt="www.cacert.org" border="0" /><br /><br />
-<img src="logos/cacert-secure-site.png" alt="www.cacert.org" border="0" />&nbsp;&nbsp;
-<img src="logos/cacert-secure-site2.png" alt="www.cacert.org" border="0" /><br /><br />
-<img src="logos/cacert-grey.png" alt="www.cacert.org" border="0" />&nbsp;&nbsp;
-<img src="logos/cacert-grey2.png" alt="www.cacert.org" border="0" /><br /><br />
+<img src="logos/cacert1.png" alt="www.cacert.org" border="0">&nbsp;&nbsp;
+<img src="logos/cacert-free-certificates2.png" alt="www.cacert.org" border="0">&nbsp;&nbsp;
+<img src="logos/cacert-free-certificates3.png" alt="www.cacert.org" border="0">&nbsp;&nbsp;
+<img src="logos/cacert-free-certificates4.png" alt="www.cacert.org" border="0"><br><br>
+<img src="logos/cacert-secured3.png" alt="www.cacert.org" border="0">&nbsp;&nbsp;
+<img src="logos/cacert-secured4.png" alt="www.cacert.org" border="0">&nbsp;&nbsp;
+<img src="logos/cacert-secured5.png" alt="www.cacert.org" border="0">&nbsp;&nbsp;
+<img src="logos/cacert-secured7.png" alt="www.cacert.org" border="0"><br><br>
+<img src="logos/cacert-secure-site.png" alt="www.cacert.org" border="0">&nbsp;&nbsp;
+<img src="logos/cacert-secure-site2.png" alt="www.cacert.org" border="0">&nbsp;&nbsp;
+<img src="logos/cacert-grey.png" alt="www.cacert.org" border="0">&nbsp;&nbsp;
+<img src="logos/cacert-grey2.png" alt="www.cacert.org" border="0"><br><br>
 
-<img src="logos/small-ssl-secured-site.png" alt="www.cacert.org" border="0" />&nbsp;&nbsp;
-<img src="logos/small-ssl-security.png" alt="www.cacert.org" border="0" /><br /><br />
+<img src="logos/small-ssl-secured-site.png" alt="www.cacert.org" border="0">&nbsp;&nbsp;
+<img src="logos/small-ssl-security.png" alt="www.cacert.org" border="0">&nbsp;&nbsp;
+<img src="logos/animated.gif" alt="www.cacert.org" border="0"><br><br>
 
 </td></tr></table>
 
diff --git a/www/src-lic.php b/www/src-lic.php
index 6c66421..810a2e9 100644
--- a/www/src-lic.php
+++ b/www/src-lic.php
@@ -1,7 +1,7 @@
 <?
 	if($process == "Confirm, I agree to these terms and conditions" && $iagree == "yes")
 	{
-		$output_file = $fname = "cacert-20041103.tar.bz2";
+		$output_file = $fname = "cacert-20041201.tar.bz2";
 
 		header('Pragma: public');
 
diff --git a/www/stats.php b/www/stats.php
new file mode 100644
index 0000000..379b33e
--- /dev/null
+++ b/www/stats.php
@@ -0,0 +1,51 @@
+<?
+        loadem("index");
+        showheader(_("Welcome to CAcert.org"));
+?>
+<h1>CAcert.org <?=_("Statistics")?></h1>
+
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td colspan="2" class="title">CAcert.org <?=_("Statistics")?></td>
+  </tr>
+  <tr>
+    <td class="DataTD"><?=_("Users")?>:</td>
+    <td class="DataTD"><?=number_format(mysql_num_rows(mysql_query("select * from `users` where `verified`=1")))?></td>
+  </tr>
+  <tr>
+    <td class="DataTD"><?=_("Verified Emails")?>:</td>
+    <td class="DataTD"><?=number_format(mysql_num_rows(mysql_query("select * from `email` where `hash`='' and `deleted`=0")))?></td>
+  </tr>
+  <tr>
+    <td class="DataTD"><?=_("Verified Domains")?>:</td>
+    <td class="DataTD"><?=number_format(mysql_num_rows(mysql_query("select * from `domains` where `hash`='' and `deleted`=0")))?></td>
+  </tr>
+<?
+	$certs = mysql_num_rows(mysql_query("select * from `domaincerts`"));
+	$certs += mysql_num_rows(mysql_query("select * from `emailcerts`"));
+	$certs += mysql_num_rows(mysql_query("select * from `gpg`"));
+	$certs += mysql_num_rows(mysql_query("select * from `orgdomaincerts`"));
+	$certs += mysql_num_rows(mysql_query("select * from `orgemailcerts`"));
+?>
+  <tr>
+    <td class="DataTD"><?=_("Certificates Issued")?>:</td>
+    <td class="DataTD"><?=number_format($certs)?></td>
+  </tr>
+<?
+	$certs = mysql_num_rows(mysql_query("select * from `domaincerts` where `revoked`=0 and `expire`>NOW()"));
+	$certs += mysql_num_rows(mysql_query("select * from `emailcerts` where `revoked`=0 and `expire`>NOW()"));
+	$certs += mysql_num_rows(mysql_query("select * from `gpg` where `expire`<=NOW()"));
+	$certs += mysql_num_rows(mysql_query("select * from `orgdomaincerts` where `revoked`=0 and `expire`>NOW()"));
+	$certs += mysql_num_rows(mysql_query("select * from `orgemailcerts` where `revoked`=0 and `expire`>NOW()"));
+?>
+  <tr>
+    <td class="DataTD"><?=_("Valid Certificates")?>:</td>
+    <td class="DataTD"><?=number_format($certs)?></td>
+  </tr>
+  <tr>
+    <td class="DataTD"><?=_("Assurers")?>:</td>
+    <td class="DataTD"><?=number_format(mysql_num_rows(mysql_query("select * from notary group by `to` having sum(`points`) >= 100")))?></td>
+  </tr>
+</table>
+<? showfooter(); ?>
+