From 657839014a880c092cb3f511127b992ed77cc47e Mon Sep 17 00:00:00 2001 From: obigal Date: Fri, 5 Jul 2013 05:24:04 -0400 Subject: [PATCH] Update for pushpool compatibility --- public/include/classes/share.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/include/classes/share.class.php b/public/include/classes/share.class.php index a2ee1c1c..ade40cfe 100644 --- a/public/include/classes/share.class.php +++ b/public/include/classes/share.class.php @@ -70,7 +70,7 @@ class Share { **/ public function getRoundShares($previous_upstream=0, $current_upstream) { $stmt = $this->mysqli->prepare("SELECT - SUM(difficulty) as total + SUM(IF(difficulty=0, pow(2, (" . $this->config['difficulty'] . " - 16)) - 1, difficulty)) as total FROM $this->table WHERE our_result = 'Y' AND id > ? AND id <= ? @@ -98,8 +98,8 @@ class Share { a.id, SUBSTRING_INDEX( s.username , '.', 1 ) as username, a.no_fees AS no_fees, - IFNULL(SUM(IF(our_result='Y', difficulty, 0)), 0) AS valid, - IFNULL(SUM(IF(our_result='N', difficulty, 0)), 0) AS invalid + IFNULL(SUM(IF(our_result='Y', IF(difficulty=0, pow(2, (" . $this->config['difficulty'] . " - 16)) - 1, difficulty), 0)), 0) AS valid, + IFNULL(SUM(IF(our_result='N', IF(difficulty=0, pow(2, (" . $this->config['difficulty'] . " - 16)) - 1, difficulty), 0)), 0) AS invalid FROM $this->table AS s LEFT JOIN " . $this->user->getTableName() . " AS a ON a.username = SUBSTRING_INDEX( s.username , '.', 1 )