summaryrefslogtreecommitdiff
path: root/CommModule
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-03-21 17:15:23 +0100
committerMichael Tänzer <neo@nhng.de>2014-03-21 17:15:23 +0100
commitecd7c1033d881d51b54926075cfca3e9cd19a34d (patch)
tree7d0a758596fea01d772b302ceb5020bdf8e778df /CommModule
parent56f0ddf35014a7c6384b09f386c3b84f3b59b183 (diff)
parentcff982918cd654ab9028ecc10b1ea3b2592ad9be (diff)
downloadcacert-devel-ecd7c1033d881d51b54926075cfca3e9cd19a34d.tar.gz
cacert-devel-ecd7c1033d881d51b54926075cfca3e9cd19a34d.tar.xz
cacert-devel-ecd7c1033d881d51b54926075cfca3e9cd19a34d.zip
Merge branch 'bug-1221' into testserver-stable
Conflicts: www/wot.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'CommModule')
-rwxr-xr-xCommModule/client.pl2
-rwxr-xr-xCommModule/usbclient.pl2
2 files changed, 2 insertions, 2 deletions
diff --git a/CommModule/client.pl b/CommModule/client.pl
index 8b29d62..9c93245 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]."' group by `to`");
+ my @sum = $dbh->selectrow_array("select sum(`points`) as `total` from `notary` where `to`='".$_[0]."' and `deleted`=0 group by `to`");
SysLog("Summe: $sum[0]\n") if($debug);
return ($sum[0]>=50)?30:3;
diff --git a/CommModule/usbclient.pl b/CommModule/usbclient.pl
index 3cbe2c3..6cbc111 100755
--- a/CommModule/usbclient.pl
+++ b/CommModule/usbclient.pl
@@ -425,7 +425,7 @@ sub calculateDays($)
{
if($_[0])
{
- my @sum = $dbh->selectrow_array("select sum(`points`) as `total` from `notary` where `to`='".$_[0]."' group by `to`");
+ my @sum = $dbh->selectrow_array("select sum(`points`) 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;