From 01faa352ccbd433989a07e8b40daed6f1d49de97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20D=C3=B6rre?= Date: Tue, 14 Apr 2015 21:35:22 +0200 Subject: UPD: new points calculation in CommModule/client.pl --- CommModule/client.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CommModule') diff --git a/CommModule/client.pl b/CommModule/client.pl index 0874477..a36bad0 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 group by `to`"); SysLog("Summe: $sum[0]\n") if($debug); return ($sum[0]>=50)?730:180; -- cgit v1.2.1 From d051818b7731d025b4f01686e9266a5294bd04c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20D=C3=B6rre?= Date: Thu, 30 Apr 2015 00:49:21 +0200 Subject: bug 1062: the 'administrative increase'-check --- CommModule/client.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CommModule') diff --git a/CommModule/client.pl b/CommModule/client.pl index a36bad0..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(`awarded`) 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; -- cgit v1.2.1