From 29246a1f11712f1fc718724fa9c92fd875f078f1 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 16 Sep 2013 16:21:23 +0200 Subject: [PATCH] add cached share information to dashboard data API --- public/include/pages/api/getdashboarddata.inc.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/public/include/pages/api/getdashboarddata.inc.php b/public/include/pages/api/getdashboarddata.inc.php index eca64c3e..850edbcd 100644 --- a/public/include/pages/api/getdashboarddata.inc.php +++ b/public/include/pages/api/getdashboarddata.inc.php @@ -48,6 +48,10 @@ $dPersonalHashrate = $statistics->getUserHashrate($id, $interval); $dPersonalSharerate = $statistics->getUserSharerate($id, $interval); $statistics->setGetCache(true); +// Use caches for this one +$aUserRoundShares = $statistics->getUserShares($id); +$aRoundShares = $statistics->getRoundShares(); + // Apply pool modifiers $dPersonalHashrateAdjusted = $dPersonalHashrate * $dPersonalHashrateModifier; $dPoolHashrateAdjusted = $dPoolHashrate * $dPoolHashrateModifier; @@ -57,8 +61,8 @@ $dNetworkHashrateAdjusted = $dNetworkHashrate / 1000 * $dNetworkHashrateModifier echo json_encode(array($_REQUEST['action'] => array( 'runtime' => (microtime(true) - $dTimeStart) * 1000, 'raw' => array( 'personal' => array( 'hashrate' => $dPersonalHashrate ), 'pool' => array( 'hashrate' => $dPoolHashrate ), 'network' => array( 'hashrate' => $dNetworkHashrate / 1000 ) ), - 'personal' => array ( 'hashrate' => $dPersonalHashrateAdjusted, 'sharerate' => $dPersonalSharerate ), - 'pool' => array( 'hashrate' => $dPoolHashrateAdjusted ), + 'personal' => array ( 'hashrate' => $dPersonalHashrateAdjusted, 'sharerate' => $dPersonalSharerate, 'shares' => $aUserRoundShares), + 'pool' => array( 'hashrate' => $dPoolHashrateAdjusted, 'shares' => $aRoundShares ), 'network' => array( 'hashrate' => $dNetworkHashrateAdjusted ), )));