From d468c826940567d4b061c072051945c0735852dd Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 13 Mar 2014 14:25:52 +0100
Subject: [PATCH] [ADDED] Block or Payout based bonus percentage

---
 cronjobs/pplns_payout.php                 | 10 ++++++++--
 cronjobs/proportional_payout.php          |  9 +++++++--
 public/include/config/global.inc.dist.php |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/cronjobs/pplns_payout.php b/cronjobs/pplns_payout.php
index 68b3ef2d..c256b279 100755
--- a/cronjobs/pplns_payout.php
+++ b/cronjobs/pplns_payout.php
@@ -201,14 +201,20 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
       // Defaults
       $aData['fee' ] = 0;
       $aData['donation'] = 0;
+      $aData['pool_bonus'] = 0;
 
       // Calculate pool fees
       if ($config['fees'] > 0 && $aData['no_fees'] == 0)
         $aData['fee'] = round($config['fees'] / 100 * $aData['payout'], 8);
 
       // Calculate pool bonus if it applies, will be paid from liquid assets!
-      if ($config['pool_bonus'] > 0)
-        $aData['pool_bonus'] = round(( $config['pool_bonus'] / 100 ) * $dReward, 8);
+      if ($config['pool_bonus'] > 0) {
+        if ($config['pool_bonus_type'] == 'block') {
+          $aData['pool_bonus'] = round(( $config['pool_bonus'] / 100 ) * $dReward, 8);
+        } else {
+          $aData['pool_bonus'] = round(( $config['pool_bonus'] / 100 ) * $aData['payout'], 8);
+        }
+      }
 
       // Calculate donation amount, fees not included
       $aData['donation'] = round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 8);
diff --git a/cronjobs/proportional_payout.php b/cronjobs/proportional_payout.php
index 7f5b163f..80b74231 100755
--- a/cronjobs/proportional_payout.php
+++ b/cronjobs/proportional_payout.php
@@ -95,8 +95,13 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
         $aData['fee'] = round($config['fees'] / 100 * $aData['payout'], 8);
 
       // Calculate pool bonus if it applies, will be paid from liquid assets!
-      if ($config['pool_bonus'] > 0)
-        $aData['pool_bonus'] = round(( $config['pool_bonus'] / 100 ) * $dReward, 8);
+      if ($config['pool_bonus'] > 0) {
+        if ($config['pool_bonus_type'] == 'block') {
+          $aData['pool_bonus'] = round(( $config['pool_bonus'] / 100 ) * $dReward, 8);
+        } else {
+          $aData['pool_bonus'] = round(( $config['pool_bonus'] / 100 ) * $aData['payout'], 8);
+        }
+      }
 
       // Calculate donation amount, fees not included
       $aData['donation'] = round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 8);
diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php
index 3df03f70..b1a2d7a7 100644
--- a/public/include/config/global.inc.dist.php
+++ b/public/include/config/global.inc.dist.php
@@ -135,6 +135,7 @@ $config['txfee_manual'] = 0.1;
  */
 $config['block_bonus'] = 0;
 $config['pool_bonus'] = 0;
+$config['pool_bonus_type'] = 'payout';
 
 /**
  * Payout System