summaryrefslogtreecommitdiff
path: root/CommModule
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-05-05 19:09:30 +0200
committerBenny Baumann <BenBE@geshi.org>2015-05-05 19:09:30 +0200
commit70f867dca49fa2f999470913ff75f816bcbb700d (patch)
treee8907b51235fe0c5e9d3d95defa61c685d5221b9 /CommModule
parentaaffd10f8439c32bfbb8bfca83c08f98f23fb2c9 (diff)
parent77ed5c5b06c2dc8fafc74c1be5a6197bb45e0f11 (diff)
downloadcacert-devel-70f867dca49fa2f999470913ff75f816bcbb700d.tar.gz
cacert-devel-70f867dca49fa2f999470913ff75f816bcbb700d.tar.xz
cacert-devel-70f867dca49fa2f999470913ff75f816bcbb700d.zip
Merge branch 'bug-1042' into testserver-stable
Diffstat (limited to 'CommModule')
-rwxr-xr-xCommModule/client.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/CommModule/client.pl b/CommModule/client.pl
index 64c3c7f..24f0abc 100755
--- a/CommModule/client.pl
+++ b/CommModule/client.pl
@@ -441,7 +441,7 @@ sub calculateDays($)
{
if($_[0])
{
- my @sum = $dbh->selectrow_array("select sum(`points`) as `total` from `notary` where `to`='".$_[0]."' and `deleted`=0 group by `to`");
+ my @sum = $dbh->selectrow_array("select sum(`awarded`) as `total` from `notary` where `to`='".$_[0]."' and `deleted`=0 AND `notary`.`method` != 'Administrative Increase' AND `notary`.`from` != `notary`.`to` group by `to`");
SysLog("Summe: $sum[0]\n") if($debug);
return ($sum[0]>=50)?30:3;