Merge pull request #2197 from iAmShorty/disable-earnings-page

[FIX] disable earnings when tx summaries are disabled

Author: TheSerapher

include/pages/account/earnings.inc.php

@@ -2,20 +2,22 @@
 $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
 
 // Check user authentication status
-if ($user->isAuthenticated()) {
+if ($user->isAuthenticated() AND !$setting->getValue('disable_transactionsummary')) {
   if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
     $iLimit = 30;
     $debug->append('No cached version available, fetching from backend', 3);
-    if (!$setting->getValue('disable_transactionsummary')) {
-      $aTransactionSummary = $transaction->getTransactionSummary($_SESSION['USERDATA']['id']);
-      $aTransactionSummaryByTime = $transaction->getTransactionTypebyTime($_SESSION['USERDATA']['id']);
-      $smarty->assign('SUMMARY', $aTransactionSummary);
-      $smarty->assign('BYTIME', $aTransactionSummaryByTime);
-    }
+    $aTransactionSummary = $transaction->getTransactionSummary($_SESSION['USERDATA']['id']);
+    $aTransactionSummaryByTime = $transaction->getTransactionTypebyTime($_SESSION['USERDATA']['id']);
+    $smarty->assign('SUMMARY', $aTransactionSummary);
+    $smarty->assign('BYTIME', $aTransactionSummaryByTime);
   } else {
     $debug->append('Using cached page', 3);
   }
+  $smarty->assign('CONTENT', 'default.tpl');
+} else if (!$setting->getValue('disable_transactionsummary')) {
+  $smarty->assign('CONTENT', 'disabled.tpl');
+} else {
+  $smarty->assign('CONTENT', 'disabled.tpl');
 }
 
-$smarty->assign('CONTENT', 'default.tpl');
 ?>

include/smarty_globals.inc.php

@@ -79,6 +79,7 @@
     'disable_contactform' => $setting->getValue('disable_contactform'),
     'disable_contactform_guest' => $setting->getValue('disable_contactform_guest'),
     'disable_worker_edit' => $setting->getValue('disable_worker_edit'),
+    'disable_transactionsummary' => $setting->getValue('disable_transactionsummary'),
     'algorithm' => $config['algorithm'],
     'getbalancewithunconfirmed' => $config['getbalancewithunconfirmed'],
     'target_bits' => $coin->getTargetBits(),

templates/bootstrap/account/earnings/disabled.tpl

@@ -15,7 +15,7 @@
                           <li><a href="{$smarty.server.SCRIPT_NAME}?page=account&action=edit"><i class="fa fa-edit fa-fw"></i> Edit Account</a></li>
                           <li><a href="{$smarty.server.SCRIPT_NAME}?page=account&action=workers"><i class="fa fa-desktop fa-fw"></i> My Workers</a></li>
                           <li><a href="{$smarty.server.SCRIPT_NAME}?page=account&action=transactions"><i class="fa fa-credit-card fa-fw"></i> Transactions</a></li>
-                          <li><a href="{$smarty.server.SCRIPT_NAME}?page=account&action=earnings"><i class="fa fa-money fa-fw"></i> Earnings</a></li>
+                          {if !$GLOBAL.config.disable_transactionsummary}<li><a href="{$smarty.server.SCRIPT_NAME}?page=account&action=earnings"><i class="fa fa-money fa-fw"></i> Earnings</a></li>{/if}
                           {if !$GLOBAL.config.disable_notifications}<li><a href="{$smarty.server.SCRIPT_NAME}?page=account&action=notifications"><i class="fa fa-bullhorn fa-fw"></i> Notifications</a></li>{/if}
                           {if !$GLOBAL.config.disable_invitations}<li><a href="{$smarty.server.SCRIPT_NAME}?page=account&action=invitations"><i class="fa fa-users fa-fw"></i> Invitations</a></li>{/if}
                           {if !$GLOBAL.acl.qrcode}<li><a href="{$smarty.server.SCRIPT_NAME}?page=account&action=qrcode"><i class="fa fa-qrcode fa-fw"></i> QR Codes</a></li>{/if}