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) { ?>
@@ -139,7 +141,44 @@
=$drow['points']?> |
+
+ $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) { ?>
+
+
+ =_("Alternate Verified Email Addresses")?> |
+
+ $rc = mysql_num_rows($dres);
+ while($drow = mysql_fetch_assoc($dres))
+ { ?>
+
+ =_("Secondary Emails")?>: |
+ =$drow['email']?> |
+
+ } ?>
+
+
} ?>
+
+ $query = "select * from `domains` where `memid`='".$row['id']."' and `deleted`=0 and `hash`=''";
+ $dres = mysql_query($query);
+ if(mysql_num_rows($dres) > 0) { ?>
+
+
+ =_("Verified Domains")?> |
+
+ $rc = mysql_num_rows($dres);
+ while($drow = mysql_fetch_assoc($dres))
+ { ?>
+
+ =_("Domain")?>: |
+ =$drow['domain']?> |
+
+ } ?>
+
+ } ?>
=_("Your Assurance Points")?> |
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 CAcert.org site logo and some gimp
magic. Send comments or suggestions to Chris. Licence: Whatever. I don't care.
-![www.cacert.org](logos/cacert1.png)
-
-
-![www.cacert.org](logos/cacert-free-certificates4.png)
-
-
-![www.cacert.org](logos/cacert-secured5.png)
-![www.cacert.org](logos/cacert-secured7.png)
-
-![www.cacert.org](logos/cacert-secure-site2.png)
-
-![www.cacert.org](logos/cacert-grey2.png)
+
+
+
+![www.cacert.org](logos/cacert-free-certificates4.png)
+
+
+
+![www.cacert.org](logos/cacert-secured7.png)
+
+
+
+![www.cacert.org](logos/cacert-grey2.png)
-
-![www.cacert.org](logos/small-ssl-security.png)
+
+
+![www.cacert.org](logos/animated.gif)
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"));
+?>
+CAcert.org =_("Statistics")?>
+
+
+
+ CAcert.org =_("Statistics")?> |
+
+
+ =_("Users")?>: |
+ =number_format(mysql_num_rows(mysql_query("select * from `users` where `verified`=1")))?> |
+
+
+ =_("Verified Emails")?>: |
+ =number_format(mysql_num_rows(mysql_query("select * from `email` where `hash`='' and `deleted`=0")))?> |
+
+
+ =_("Verified Domains")?>: |
+ =number_format(mysql_num_rows(mysql_query("select * from `domains` where `hash`='' and `deleted`=0")))?> |
+
+
+ $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`"));
+?>
+
+ =_("Certificates Issued")?>: |
+ =number_format($certs)?> |
+
+
+ $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()"));
+?>
+
+ =_("Valid Certificates")?>: |
+ =number_format($certs)?> |
+
+
+ =_("Assurers")?>: |
+ =number_format(mysql_num_rows(mysql_query("select * from notary group by `to` having sum(`points`) >= 100")))?> |
+
+
+ showfooter(); ?>
+