summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-04-30 00:56:42 +0200
committerBenny Baumann <BenBE@geshi.org>2015-04-30 00:56:42 +0200
commit77ed5c5b06c2dc8fafc74c1be5a6197bb45e0f11 (patch)
tree6255df0f4392785f08e20058b6a79a1a9b0e46c0
parentc2f2aedfdd889e9eb8bedeb60df5a5e8cad361a6 (diff)
parentd051818b7731d025b4f01686e9266a5294bd04c7 (diff)
downloadcacert-devel-77ed5c5b06c2dc8fafc74c1be5a6197bb45e0f11.tar.gz
cacert-devel-77ed5c5b06c2dc8fafc74c1be5a6197bb45e0f11.tar.xz
cacert-devel-77ed5c5b06c2dc8fafc74c1be5a6197bb45e0f11.zip
Merge branch 'bug-1062' into bug-1042
-rwxr-xr-xCommModule/client.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/CommModule/client.pl b/CommModule/client.pl
index 0874477..6cdb0db 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)?730:180;