summaryrefslogtreecommitdiff
path: root/stamp
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-06-13 09:19:57 +0200
committerBenny Baumann <BenBE@geshi.org>2014-06-13 09:19:57 +0200
commitf25f8af03c96cfcd4dd83a9f3b6ee4181eb3e2c9 (patch)
tree7162d1c77760fad5c53474d9bf0a0c7e122b2f66 /stamp
parent57ba86ff84eb3dcc15f8122b29efeae54434652e (diff)
parent2affa9c6e9a1f2a7f68ab5fa306374cd037d6227 (diff)
downloadcacert-devel-f25f8af03c96cfcd4dd83a9f3b6ee4181eb3e2c9.tar.gz
cacert-devel-f25f8af03c96cfcd4dd83a9f3b6ee4181eb3e2c9.tar.xz
cacert-devel-f25f8af03c96cfcd4dd83a9f3b6ee4181eb3e2c9.zip
Merge branch 'release' into bug-807
Conflicts: includes/account.php includes/lib/account.php pages/account/16.php
Diffstat (limited to 'stamp')
-rw-r--r--stamp/common.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/stamp/common.php b/stamp/common.php
index ff814dd..d99a23a 100644
--- a/stamp/common.php
+++ b/stamp/common.php
@@ -41,9 +41,9 @@
if($row['certid'] > 0)
{
if($row['org'] == 0)
- $query = "select * from `domaincerts` where `id`='$row[certid]' and `expire`>NOW() and `revoked`=0";
+ $query = "select * from `domaincerts` where `id`='".intval($row['certid'])."' and `expire`>NOW() and `revoked`=0";
else
- $query = "select * from `orgdomaincerts` where `id`='$row[certid]' and `expire`>NOW() and `revoked`=0";
+ $query = "select * from `orgdomaincerts` where `id`='".intval($row['certid'])."' and `expire`>NOW() and `revoked`=0";
if($_REQUEST['debug'] == 1)
echo $query."<br>\n";
$res = mysql_query($query);
@@ -117,7 +117,7 @@
if($org == 0)
{
$query = "SELECT *, sum(`points`) AS `total` FROM `users`, `notary` WHERE `users`.`id` = '$cert[memid]' AND
- `notary`.`to` = `users`.`id` and `notary`.`when` <= '$cert[issued]' GROUP BY `notary`.`to`";
+ `notary`.`to` = `users`.`id` and `notary`.`when` <= '$cert[issued]' and `notary`.`deleted`=0 GROUP BY `notary`.`to`";
$user = mysql_fetch_assoc(mysql_query($query));
} else {
$query = "select * from `orginfo` where `id`='$cert[orgid]'";