From 552f8d6912b9efbe939859de2a8435c264385f79 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Sat, 1 Mar 2014 21:01:32 +0100
Subject: [PATCH] [FIX] Reports page

---
 public/include/pages/admin/reports.inc.php    |  44 ++++----
 .../admin/reports/earnings_control.tpl        | 104 +++++++++---------
 2 files changed, 71 insertions(+), 77 deletions(-)

diff --git a/public/include/pages/admin/reports.inc.php b/public/include/pages/admin/reports.inc.php
index 3139234c..1723fd2f 100644
--- a/public/include/pages/admin/reports.inc.php
+++ b/public/include/pages/admin/reports.inc.php
@@ -28,24 +28,24 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
         $iLimit = 1000;
   }
 
-  if (@$_REQUEST['next'] && !empty($_REQUEST['height'])) {
-    $iHeight = @$roundstats->getNextBlockForStats($_REQUEST['height'], $iLimit);
-      if (!$iHeight) {
-        $aBlock = $block->getLast();
-        $iHeight = $aBlock['height']; 
-      }
-  } else if (@$_REQUEST['prev'] && !empty($_REQUEST['height'])) {
-      $iHeight = $_REQUEST['height'];
-  } else if (!empty($_REQUEST['height']) && is_numeric($_REQUEST['height'])) {
-      $iHeight = $_REQUEST['height']; 
-  } else {
-      $aBlock = $block->getLast();
-      $iHeight = $aBlock['height'];
-  }
-
   if (@$_REQUEST['search']) {
     $iHeight = $roundstats->searchForBlockHeight($_REQUEST['search']);
   }
+  if (@$_REQUEST['next'] && !empty($_REQUEST['height'])) {
+    $iHeight = @$roundstats->getNextBlock($_REQUEST['height']);
+    if (!$iHeight) {
+      $iBlock = $block->getLast();
+      $iHeight = $iBlock['height'];
+    }
+  } else if (@$_REQUEST['prev'] && !empty($_REQUEST['height'])) {
+    $iHeight = $roundstats->getPreviousBlock($_REQUEST['height']);
+  } else if (empty($_REQUEST['height'])) {
+    $iBlock = $block->getLast();
+    $iHeight = $iBlock['height'];
+  } else {
+    $iHeight = $_REQUEST['height'];
+  }
+  $_REQUEST['height'] = $iHeight;
 
   if (@$_REQUEST['filter']) {
     $filter = $_REQUEST['filter'];
@@ -65,13 +65,13 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
     }
   }
 
-    $smarty->assign('REPORTDATA', $aBlocksData);
-    $smarty->assign("USERLIST", $aUserList);
-    $smarty->assign("USERNAME", $userName);
-    $smarty->assign("USERID", $iUserId);
-    $smarty->assign("BLOCKLIMIT", $iLimit);
-    $smarty->assign("HEIGHT", $iHeight);
-    $smarty->assign("FILTER", $filter);
+  $smarty->assign('REPORTDATA', $aBlocksData);
+  $smarty->assign("USERLIST", $aUserList);
+  $smarty->assign("USERNAME", $userName);
+  $smarty->assign("USERID", $iUserId);
+  $smarty->assign("BLOCKLIMIT", $iLimit);
+  $smarty->assign("HEIGHT", $iHeight);
+  $smarty->assign("FILTER", $filter);
 } else {
   $debug->append('Using cached page', 3);
 }
diff --git a/public/templates/bootstrap/admin/reports/earnings_control.tpl b/public/templates/bootstrap/admin/reports/earnings_control.tpl
index 8294ea51..ed9c4c98 100644
--- a/public/templates/bootstrap/admin/reports/earnings_control.tpl
+++ b/public/templates/bootstrap/admin/reports/earnings_control.tpl
@@ -1,64 +1,58 @@
 <form action="{$smarty.server.SCRIPT_NAME}" method="post" role="form">
   <input type="hidden" name="page" value="{$smarty.request.page|escape|escape}">
   <input type="hidden" name="action" value="{$smarty.request.action|escape|escape}">
-<div class="row">
-  <div class="col-lg-12">
-    <div class="panel panel-info">
-      <div class="panel-heading">
-        Earnings Information
-      </div>
-      <div class="panel-body">
-        <div class="table-responsive">
-          <table class="table table-striped table-bordered table-hover">
-            <thead>
-              <td>
-                <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={if is_array($REPORTDATA) && count($REPORTDATA) > ($BLOCKLIMIT - 1)}{$REPORTDATA[$BLOCKLIMIT - 1].height}{/if}&prev=1&limit={$BLOCKLIMIT}&id={$USERID}&filter={$FILTER}"<i class="icon-left-open"></i></a>
-              </td>
-              <td>
-                <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={if is_array($REPORTDATA) && count($REPORTDATA) > 0}{$REPORTDATA[0].height}{/if}&next=1&limit={$BLOCKLIMIT}&id={$USERID}&filter={$FILTER}"><i class="icon-right-open"></i></a>
-              </td>
-            </thead>
-          </table>
+  <div class="row">
+    <div class="col-lg-12">
+      <div class="panel panel-info">
+        <div class="panel-heading">
+          Earnings Information
         </div>
-        <div class="table-responsive">
-          <table class="table table-striped table-bordered table-hover">
-            <tbody>
-              <tr>
-                <td>
-                  <div class="form-group">
-                    <label>Select User</label>
-                    {html_options class="form-control" name="id" options=$USERLIST selected=$USERID|default:"0"}
-                  </div>
-                </td>
-                <td>
-                  <div class="form-group">
-                    <label>Block Limit</label>
-                    <input size="10" class="form-control" type="text" name="limit" value="{$BLOCKLIMIT|default:"20"}" />
-                  </div>
-                </td>
-                <td>
-                  <div class="form-group">
-                    <label>Starting block height</label>
-                    <input type="text" class="form-control" name="search" value="{$HEIGHT|default:"%"}">
-                  </div>
-                </td>
-                <td>
-                  <div class="form-group">
-                    <label>SHOW EMPTY ROUNDS</label>
-                    <br>
-                    <input type="hidden" name="filter" value="0" />
-                    <input type="checkbox" data-size="small"  name="filter" id="filter" value="1" {if $FILTER}checked{/if}/>
-                    <script>
-                    $("[id='filter']").bootstrapSwitch();
-                    </script>
-                  </div>
-                </td>
-            </tbody>
-          </table>
-          <input type="submit" value="Submit" class="btn btn-outline btn-success btn-lg btn-block">
+        <div class="panel-body">
+          <div class="table-responsive">
+            <table class="table table-striped table-bordered table-hover">
+              <tbody>
+                <tr>
+                  <td colspan="4">
+                    <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={if is_array($REPORTDATA) && count($REPORTDATA) > ($BLOCKLIMIT - 1)}{$REPORTDATA[$BLOCKLIMIT - 1].height}{/if}&prev=1&limit={$BLOCKLIMIT}&id={$USERID}&filter={$FILTER}"<i class="fa fa-chevron-left fa-fw"></i></a>
+                    <a href="{$smarty.server.SCRIPT_NAME}?page={$smarty.request.page|escape}&action={$smarty.request.action|escape}&height={if is_array($REPORTDATA) && count($REPORTDATA) > 0}{$REPORTDATA[0].height}{/if}&next=1&limit={$BLOCKLIMIT}&id={$USERID}&filter={$FILTER}"><i class="fa fa-chevron-right fa-fw pull-right"></i></a>
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    <div class="form-group">
+                      <label>Select User</label>
+                      {html_options class="form-control" name="id" options=$USERLIST selected=$USERID|default:"0"}
+                    </div>
+                  </td>
+                  <td>
+                    <div class="form-group">
+                      <label>Block Limit</label>
+                      <input size="10" class="form-control" type="text" name="limit" value="{$BLOCKLIMIT|default:"20"}" />
+                    </div>
+                  </td>
+                    <td>
+                      <div class="form-group">
+                      <label>Starting block height</label>
+                      <input type="text" class="form-control" name="search" value="{$HEIGHT|default:"%"}">
+                    </div>
+                  </td>
+                  <td>
+                    <div class="form-group">
+                      <label>Show empty rounds</label>
+                      <br>
+                      <input type="hidden" name="filter" value="0" />
+                      <input type="checkbox" data-size="small"  name="filter" id="filter" value="1" {if $FILTER}checked{/if}/>
+                      <script>
+                      $("[id='filter']").bootstrapSwitch();
+                      </script>
+                    </div>
+                  </td>
+                </tbody>
+              </table>
+            <input type="submit" value="Submit" class="btn btn-outline btn-success btn-lg btn-block">
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
 </form>