From 4848d4d04d2b8a8588eed30ee893feb51730450b Mon Sep 17 00:00:00 2001 From: root Date: Sun, 5 Apr 2009 00:30:33 +0000 Subject: [PATCH] http://bugs.cacert.org/view.php?id=588 --- includes/account.php | 18 ++++++++++-------- includes/account_stuff.php | 2 +- includes/general.php | 32 +++++++++++++++++++++----------- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/includes/account.php b/includes/account.php index a614431..0f2b18e 100644 --- a/includes/account.php +++ b/includes/account.php @@ -1110,10 +1110,11 @@ if($oldid == 13 && $process != "") { - $ddquery = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`"; - $ddres = mysql_query($ddquery); - $ddrow = mysql_fetch_assoc($ddres); - $_SESSION['profile']['points'] = $ddrow['total']; + $ddquery = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`"; + $ddres = mysql_query($ddquery); + $ddrow = mysql_fetch_assoc($ddres); + $_SESSION['profile']['points'] = $ddrow['total']; + if($_SESSION['profile']['points'] == 0) { $_SESSION['_config']['user']['fname'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['fname'])))); @@ -1179,10 +1180,10 @@ $_SESSION['profile'] = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$_SESSION['profile']['id']."'")); $_SESSION['profile']['loggedin'] = 1; - $ddquery = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`"; - $ddres = mysql_query($ddquery); - $ddrow = mysql_fetch_assoc($ddres); - $_SESSION['profile']['points'] = $ddrow['total']; + $ddquery = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`"; + $ddres = mysql_query($ddquery); + $ddrow = mysql_fetch_assoc($ddres); + $_SESSION['profile']['points'] = $ddrow['total']; $id = 13; @@ -2715,6 +2716,7 @@ { mysql_query("insert into `notary` set `from`='0', `to`='$memid', `points`='$points', `method`='Thawte Points Transfer', `when`=NOW()"); + fix_assurer_flag($memid); } $totalpoints = intval($tmp['points']) + $points; diff --git a/includes/account_stuff.php b/includes/account_stuff.php index 3031952..57a574c 100644 --- a/includes/account_stuff.php +++ b/includes/account_stuff.php @@ -217,7 +217,7 @@ function hideall() {

+

- +

+

= 100'); // Challenge has been passed and non-expired points >= 100 + '\' AND EXISTS(SELECT 1 FROM `cats_passed` AS `tp`, `cats_variant` AS `cv` WHERE `tp`.`variant_id` = `cv`.`id` AND `cv`.`type_id` = 1 AND `tp`.`user_id` = `u`.`id`)'. + ' AND (SELECT SUM(`points`) FROM `notary` AS `n` WHERE `n`.`to` = `u`.`id` AND `expire` < now()) >= 100'); // Challenge has been passed and non-expired points >= 100 // Reset flag if requirements are not met $query = mysql_query('UPDATE `users` AS `u` SET `assurer` = 0 WHERE `u`.`id` = \''.(int)intval($userID). - '\' AND (NOT EXISTS(SELECT 1 FROM `cats_passed` AS `tp` WHERE `tp`.`user_id` = `u`.`id`)'. - ' OR (SELECT SUM(`points`) FROM `notary` AS `n` WHERE `n`.`to` = `u`.`id` AND `n`.`expire` < now()) < 100)'); + '\' AND (NOT EXISTS(SELECT 1 FROM `cats_passed` AS `tp`, `cats_variant` AS `cv` WHERE `tp`.`variant_id` = `cv`.`id` AND `cv`.`type_id` = 1 AND `tp`.`user_id` = `u`.`id`)'. + ' OR (SELECT SUM(`points`) FROM `notary` AS `n` WHERE `n`.`to` = `u`.`id` AND `n`.`expire` < now()) < 100)'); } // returns 0 if $userID is an Assurer @@ -845,12 +844,11 @@ // Bit 1 is set if 100 Assurance Points are not reached // Bit 2 is set if Assurer Test is missing // Bit 3 is set if the user is not allowed to be an Assurer (assurer_blocked > 0) - function is_no_assurer($userID) + function get_assurer_status($userID) { $Result = 0; - - // Note: If other tests are implemented an additional restriction for cats_passed would be needed here... - $query = mysql_query('SELECT * FROM `cats_passed` AS `tp` WHERE `tp`.`user_id` = \''.(int)intval($userID).'\''); + $query = mysql_query('SELECT * FROM `cats_passed` AS `tp`, `cats_variant` AS `cv` '. + ' WHERE `tp`.`variant_id` = `cv`.`id` AND `cv`.`type_id` = 1 AND `tp`.`user_id` = \''.(int)intval($userID).'\''); if(mysql_num_rows($query) < 1) { $Result |= 5; @@ -883,13 +881,25 @@ } elseif ($Status == 7) { $Result = _("To become an Assurer have to collect 100 Assurance Points and pass the ").'Assurer Challenge!'; } elseif ($Status & 8 > 0) { - $Result = _("Sorry, you are not allowed to be an Assurer. Please contact ").'support@cacert.org'._(" if you feel that this is not corect."); + $Result = _("Sorry, you are not allowed to be an Assurer. Please contact ").'cacert-support@lists.cacert.org'._(" if you feel that this is not corect."); } else { - $Result = _("You are not an Assurer, but the reason is not stored in the database. Please contact ").'support@cacert.org.'; + $Result = _("You are not an Assurer, but the reason is not stored in the database. Please contact ").'cacert-support@lists.cacert.org.'; } return $Result; } + function is_assurer($userID) + { + if (get_assurer_status($userID)) + return 0; + else + return 1; + } + + function get_assurer_reason($userID) + { + return no_assurer_text(get_assurer_status($userID)); + } ?>