From 22b6901149d0f38e6ac663c6dd1f7e50405f9910 Mon Sep 17 00:00:00 2001
From: iAmShorty <rafta@gmx.net>
Date: Tue, 25 Mar 2014 09:20:48 +0100
Subject: [PATCH 1/2] [FIX] getbalance fix for coins with getbalance problems

---
 cronjobs/payouts.php                          | 20 +++++++++----------
 public/include/config/global.inc.dist.php     |  7 +++++++
 public/include/smarty_globals.inc.php         |  1 +
 .../templates/mpos/admin/wallet/default.tpl   |  4 ++++
 4 files changed, 22 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 cronjobs/payouts.php

diff --git a/cronjobs/payouts.php b/cronjobs/payouts.php
old mode 100755
new mode 100644
index 23730052c..0edb9b3c5
--- a/cronjobs/payouts.php
+++ b/cronjobs/payouts.php
@@ -46,12 +46,12 @@
 
 // Fetch unconfirmed amount from blocks table
 empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
-$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
-$dBlocksUnconfirmedBalance = 0;
+if ($config['getbalancewithunconfirmed']) {
+  $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
+  $dBlocksUnconfirmedBalance = 0;
   if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
-
-$dWalletBalance -= $dBlocksUnconfirmedBalance;
-
+  $dWalletBalance -= $dBlocksUnconfirmedBalance;
+}
 // Fetch Newmint
 $aGetInfo = $bitcoin->getinfo();
 if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) {
@@ -133,12 +133,12 @@
 
 // Fetch unconfirmed amount from blocks table
 empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
-$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
-$dBlocksUnconfirmedBalance = 0;
+if ($config['getbalancewithunconfirmed']) {
+  $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
+  $dBlocksUnconfirmedBalance = 0;
   if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
-
-$dWalletBalance -= $dBlocksUnconfirmedBalance;
-
+  $dWalletBalance -= $dBlocksUnconfirmedBalance;
+}
 // Fetch Newmint
 $aGetInfo = $bitcoin->getinfo();
 if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) {
diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php
index b1a2d7a7e..861cf2bb1 100644
--- a/public/include/config/global.inc.dist.php
+++ b/public/include/config/global.inc.dist.php
@@ -29,6 +29,13 @@
   **/
 $config['algorithm'] = 'scrypt';
 
+/**
+  * Getbalance API Calls
+  *  System used for getting actual Balance from Wallet
+  *   https://github.com/MPOS/php-mpos/wiki/Config-Setup#getbalance-api-calls
+  **/
+$config['getbalancewithunconfirmed'] = true;
+
 /**
  * Database configuration
  *  MySQL database configuration
diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php
index 88253f245..cb8821686 100644
--- a/public/include/smarty_globals.inc.php
+++ b/public/include/smarty_globals.inc.php
@@ -75,6 +75,7 @@
     'disable_contactform' => $setting->getValue('disable_contactform'),
     'disable_contactform_guest' => $setting->getValue('disable_contactform_guest'),
     'algorithm' => $config['algorithm'],
+    'getbalancewithunconfirmed' => $config['getbalancewithunconfirmed'],
     'target_bits' => $coin->getTargetBits(),
     'accounts' => $config['accounts'],
     'disable_invitations' => $setting->getValue('disable_invitations'),
diff --git a/public/templates/mpos/admin/wallet/default.tpl b/public/templates/mpos/admin/wallet/default.tpl
index f536ee462..2f2750004 100644
--- a/public/templates/mpos/admin/wallet/default.tpl
+++ b/public/templates/mpos/admin/wallet/default.tpl
@@ -20,7 +20,11 @@
 {if $NEWMINT >= 0}
     <tr>
       <td align="left">Liquid Assets</td>
+      {if $GLOBAL.config.getbalancewithunconfirmed}
       <td align="left">{($BALANCE - $LOCKED - $UNCONFIRMED + $NEWMINT|default:"0")|number_format:"8"}</td>
+      {else}
+      <td align="left">{($BALANCE - $LOCKED + $NEWMINT|default:"0")|number_format:"8"}</td>
+      {/if}
     </tr>
     <tr>
       <td align="left">PoS New Mint</td>

From 25323f324d4f550ebda6567607a08f6ce1d9b1af Mon Sep 17 00:00:00 2001
From: iAmShorty <rafta@gmx.net>
Date: Tue, 25 Mar 2014 09:21:15 +0100
Subject: [PATCH 2/2] [FIX] file rights

---
 cronjobs/payouts.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 cronjobs/payouts.php

diff --git a/cronjobs/payouts.php b/cronjobs/payouts.php
old mode 100644
new mode 100755