From f3a0cf04178bc19f40e19385ebaa0367b02ff5d3 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Mon, 12 Aug 2013 09:35:45 +0200
Subject: [PATCH 1/2] Fixing PPLNS payouts when exceeding target

Round shares are taken to only match PPLNS target. Round target was not
re-adjusted to reflect the new, lower amount of round shares.

* Fix: Properly adjust round target shares when exceeding PPLNS target

Fixes #588 once merged
---
 cronjobs/pplns_payout.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/cronjobs/pplns_payout.php b/cronjobs/pplns_payout.php
index d6d00c9d..c71f5659 100755
--- a/cronjobs/pplns_payout.php
+++ b/cronjobs/pplns_payout.php
@@ -73,6 +73,8 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
         $monitoring->setStatus($cron_name . "_status", "okerror", 1); 
         exit(1);
       }
+      $log->logInfo('Adjusting round target to PPLNS target ' . $pplns_target);
+      $iRoundShares = $pplns_target;
     } else {
       $log->logDebug("Not able to match PPLNS target of $pplns_target with $iRoundShares");
       // We need to fill up with archived shares
@@ -124,26 +126,26 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
     // Loop through all accounts that have found shares for this round
     foreach ($aAccountShares as $key => $aData) {
       // Payout based on PPLNS target shares, proportional payout for all users
-      $aData['percentage'] = number_format(round(( 100 / $iRoundShares) * $aData['valid'], 8), 8);
-      $aData['payout'] = number_format(round(( $aData['percentage'] / 100 ) * $dReward, 8), 8);
+      $aData['percentage'] = round(( 100 / $iRoundShares) * $aData['valid'], 8);
+      $aData['payout'] = round(( $aData['percentage'] / 100 ) * $dReward, 8);
       // Defaults
       $aData['fee' ] = 0;
       $aData['donation'] = 0;
 
       if ($config['fees'] > 0 && $aData['no_fees'] == 0)
-        $aData['fee'] = number_format(round($config['fees'] / 100 * $aData['payout'], 8), 8);
+        $aData['fee'] = round($config['fees'] / 100 * $aData['payout'], 8);
       // Calculate donation amount, fees not included
-      $aData['donation'] = number_format(round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 8), 8);
+      $aData['donation'] = round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 8);
 
       // Verbose output of this users calculations
       $log->logInfo($aData['id'] . "\t" .
         $aData['username'] . "\t" .
         $aData['valid'] . "\t" .
         $aData['invalid'] . "\t" .
-        $aData['percentage'] . "\t" .
-        $aData['payout'] . "\t" .
-        $aData['donation'] . "\t" .
-        $aData['fee']);
+        number_format($aData['percentage'], 8) . "\t" .
+        number_format($aData['payout'], 8) . "\t" .
+        number_format($aData['donation'], 8) . "\t" .
+        number_format($aData['fee'], 8));
 
       // Add full round share statistics, not just PPLNS
       foreach ($aRoundAccountShares as $key => $aRoundData) {

From 22e7904da7e798212975bce70a88f6122e2c45d6 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Tue, 13 Aug 2013 09:20:06 +0200
Subject: [PATCH 2/2] Fixing round estimates on public stats page

* Fix: Display round restimates when making pool stats public via ACL
* Fix: Display proper pool efficiency when pool stats are public

Fixes #585
---
 public/include/smarty_globals.inc.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php
index 64dcf2dc..7ddeb583 100644
--- a/public/include/smarty_globals.inc.php
+++ b/public/include/smarty_globals.inc.php
@@ -12,14 +12,13 @@ $dDifficulty = 1;
 $aRoundShares = 1;
 
 // Only run these if the user is logged in
-if (@$_SESSION['AUTHENTICATED']) {
-  $aRoundShares = $statistics->getRoundShares();
-  if ($bitcoin->can_connect() === true) {
-    $dDifficulty = $bitcoin->query('getdifficulty');
-    if (is_array($dDifficulty) && array_key_exists('proof-of-work', $dDifficulty))
-      $dDifficulty = $dDifficulty['proof-of-work'];
-  }
+$aRoundShares = $statistics->getRoundShares();
+if ($bitcoin->can_connect() === true) {
+  $dDifficulty = $bitcoin->query('getdifficulty');
+  if (is_array($dDifficulty) && array_key_exists('proof-of-work', $dDifficulty))
+    $dDifficulty = $dDifficulty['proof-of-work'];
 }
+
 // Always fetch this since we need for ministats header
 $bitcoin->can_connect() === true ? $dNetworkHashrate = $bitcoin->query('getnetworkhashps') : $dNetworkHashrate = 0;