From e13773e1f15d766f76fb18e90e68e2b75d04ccd2 Mon Sep 17 00:00:00 2001 From: Philipp Dunkel Date: Thu, 17 Dec 2009 10:50:40 +0000 Subject: [PATCH] Added Caching Support http://bugs.cacert.org/view.php?id=793 --- www/stats.php | 445 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 268 insertions(+), 177 deletions(-) diff --git a/www/stats.php b/www/stats.php index 99e3a0b..93f693e 100644 --- a/www/stats.php +++ b/www/stats.php @@ -1,177 +1,268 @@ - -

CAcert.org

- - - - - - - - - - - - - - - - - - - - - - -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")); -?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CAcert.org
:
:
:
:
:
:
: 0 and sum(`points`) < 50")))?>
:= 50 and sum(`points`) < 100")))?>
:
:
:
-
- - - - - - -= 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; -?> - - - - - - - - - - - - - -
CAcert.org
- - - -
N/A
-
- - - - - - -= 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; -?> - - - - - - - - - - - - - -
CAcert.org
- - - -
N/A
-
- - + 0) { + $ar = mysql_fetch_assoc($res); + $stats = unserialize($ar['cache']); + $stats['timestamp'] = $ar['timestamp']; + if ($ar['timestamp'] + MAX_CACHE_TTL < time()) + { + $stats=getDataFromLive(); + updateCache($stats); + } + return $stats; + } + $stats=getDataFromLive(); + updateCache($stats); + return $stats; + } + + /** + * get statistics data from live tables, takes a long time so please try to use the + * cache + * @return array + */ + function getDataFromLive() { + $stats = array(); + $stats['verified_users'] = number_format(tc(mysql_query("select count(`id`) as `count` from `users` where `verified`=1"))); + $stats['verified_emails'] = number_format(tc(mysql_query("select count(`id`) as `count` from `email` where `hash`='' and `deleted`=0"))); + $stats['verified_domains'] = number_format(tc(mysql_query("select count(`id`) as `count` from `domains` where `hash`='' and `deleted`=0"))); + $certs = tc(mysql_query("select count(`id`) as `count` from `domaincerts`")); + $certs += tc(mysql_query("select count(`id`) as `count` from `emailcerts`")); + $certs += tc(mysql_query("select count(`id`) as `count` from `gpg`")); + $certs += tc(mysql_query("select count(`id`) as `count` from `orgdomaincerts`")); + $certs += tc(mysql_query("select count(`id`) as `count` from `orgemailcerts`")); + $stats['verified_certificates'] = number_format($certs); + $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()")); + $stats['valid_certificates'] = number_format($certs); + $stats['assurances_made'] = number_format(tc(mysql_query("select count(`id`) as `count` from `notary`"))); + $stats['users_1to49'] = number_format(mysql_num_rows(mysql_query("select `to` from `notary` group by `to` having sum(`points`) > 0 and sum(`points`) < 50"))); + $stats['users_50to99'] = number_format(mysql_num_rows(mysql_query("select `to` from `notary` group by `to` having sum(`points`) >= 50 and sum(`points`) < 100"))); + $stats['assurer_candidates'] = number_format(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"))); + $stats['aussurers_with_test'] = number_format(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"))); + $stats['points_issued'] = number_format(tc(mysql_query("select sum(`points`) as `count` from `notary`"))); + + $totalusers=0; + $totassurers=0; + $totalcerts=0; + for($i = 0; $i < 12; $i++) { + $tmp_arr = array(); + $tmp_arr['date'] = date("Y-m", mktime(0,0,0,date("m") - $i,1,date("Y"))); + $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; + + $tmp_arr['new_users'] = number_format($users); + $tmp_arr['new_assurers'] = number_format($assurers); + $tmp_arr['new_certificates'] = number_format($certs); + + $stats['growth_last_12m'][] = $tmp_arr; + } + $stats['growth_last_12m_total'] = array('new_users' => number_format($totalusers), + 'new_assurers' => number_format($totassurers), + 'new_certificates' => number_format($totalcerts)); + + $totalcerts = 0; + $totalusers = 0; + $totassurers = 0; + for($i = date("Y"); $i >= 2002; $i--) { + $tmp_arr = array(); + $tmp_arr['date'] = $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; + + $tmp_arr['new_users'] = number_format($users); + $tmp_arr['new_assurers'] = number_format($assurers); + $tmp_arr['new_certificates'] = number_format($certs); + + $stats['growth_last_years'][] = $tmp_arr; + } + $stats['growth_last_years_total'] = array('new_users' => number_format($totalusers), + 'new_assurers' => number_format($totassurers), + 'new_certificates' => number_format($totalcerts)); + + return $stats; + } + + $stats = getData(); +?> +

CAcert.org

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CAcert.org
:
:
:
:
:
:
:
:
:
:
:
+
+ + + + + + + + + + + + + + + + + + + + +
CAcert.org
+ + + +
N/A
+
+ + + + + + + + + + + + + + + + + + + + +
CAcert.org
+ + + +
N/A
+
+ +
+ + +