summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Dörre <felix@dogcraft.de>2015-04-02 01:49:37 +0200
committerFelix Dörre <felix@dogcraft.de>2015-04-21 21:32:03 +0200
commitb024b3419ef256089515143d7cc668395430bd7f (patch)
tree797a9f661ee6482f2496833572998ee732b982c1
parent345eb2e771f6475e243f406fe37c41933a520c11 (diff)
downloadcacert-devel-b024b3419ef256089515143d7cc668395430bd7f.tar.gz
cacert-devel-b024b3419ef256089515143d7cc668395430bd7f.tar.xz
cacert-devel-b024b3419ef256089515143d7cc668395430bd7f.zip
bug 1047: removing old points calculation from www/index.php and using the notary functions now
-rw-r--r--includes/notary.inc.php37
-rw-r--r--www/index.php5
2 files changed, 36 insertions, 6 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index 3b8e736..c68e7f2 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -322,6 +322,39 @@ define('THAWTE_REVOCATION_DATETIME', '2010-11-16 00:00:00');
$rank_of_assuree = get_top_assuree_position($num_of_assurees);
}
+ /**
+ * Helper function to sum all assurance points received by the user
+ * @param int $userid
+ */
+ function get_received_assurance_points($userid)
+ {
+ $sum_points = 0;
+ $sum_experience = 0;
+ $res = get_received_assurances(intval($userid), $log);
+ while($row = mysql_fetch_assoc($res))
+ {
+ $fromuser = get_user(intval($row['from']));
+ calc_assurances($row, $sum_points, $sum_experience);
+ }
+ return $sum_points;
+ }
+
+ /**
+ * Helper function to sum all assurance points received by the user
+ * @param int $userid
+ */
+ function get_received_experience_points($userid)
+ {
+ $sum_points = 0;
+ $sum_experience = 0;
+ $res = get_received_assurances(intval($userid), $log);
+ while($row = mysql_fetch_assoc($res))
+ {
+ $fromuser = get_user(intval($row['from']));
+ calc_assurances($row, $sum_points, $sum_experience);
+ }
+ return $sum_experience;
+ }
// ************* html table definitions ******************
@@ -585,7 +618,7 @@ define('THAWTE_REVOCATION_DATETIME', '2010-11-16 00:00:00');
$log)
{
$sum_points = 0;
- $sumexperience = 0;
+ $sum_experience = 0;
$res = get_given_assurances(intval($userid), $log);
while($row = mysql_fetch_assoc($res))
{
@@ -615,7 +648,7 @@ define('THAWTE_REVOCATION_DATETIME', '2010-11-16 00:00:00');
$log)
{
$sum_points = 0;
- $sumexperience = 0;
+ $sum_experience = 0;
$res = get_received_assurances(intval($userid), $log);
while($row = mysql_fetch_assoc($res))
{
diff --git a/www/index.php b/www/index.php
index 8c5560c..6c1eca4 100644
--- a/www/index.php
+++ b/www/index.php
@@ -210,10 +210,7 @@ require_once('../includes/notary.inc.php');
L10n::set_translation($_SESSION['profile']['language']);
L10n::init_gettext();
}
- $query = "select sum(`points`) as `total` from `notary` where `to`='".intval($_SESSION['profile']['id'])."' and `deleted`=0 group by `to`";
- $res = mysql_query($query);
- $row = mysql_fetch_assoc($res);
- $_SESSION['profile']['points'] = $row['total'];
+ $_SESSION['profile']['points'] = get_received_assurance_points($_SESSION['profile']['id']);
$_SESSION['profile']['loggedin'] = 1;
if($_SESSION['profile']['Q1'] == "" || $_SESSION['profile']['Q2'] == "" ||
$_SESSION['profile']['Q3'] == "" || $_SESSION['profile']['Q4'] == "" ||