From a6e0b9855212563aa7a636abd64fd0025d0c5dcd Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Sun, 12 May 2013 11:37:42 +0200
Subject: [PATCH] use new blocks table properly

---
 public/include/pages/statistics/pool.inc.php              | 6 +++---
 public/templates/mmcFE/statistics/blocks/blocks_found.tpl | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/include/pages/statistics/pool.inc.php b/public/include/pages/statistics/pool.inc.php
index add92cf4..3c11e98e 100644
--- a/public/include/pages/statistics/pool.inc.php
+++ b/public/include/pages/statistics/pool.inc.php
@@ -30,15 +30,15 @@ $aContributorData = $contributors->fetch_all(MYSQLI_ASSOC);
 $stmt->close();
 
 // Grab the last block found
-$stmt = $mysqli->prepare("SELECT n.blockNumber, n.confirms, n.timestamp FROM winning_shares w, networkBlocks n WHERE w.blockNumber = n.blockNumber ORDER BY w.blockNumber DESC LIMIT 1");
+$stmt = $mysqli->prepare("SELECT id, confirmations, timestamp FROM blocks ORDER BY height DESC LIMIT 1");
 $stmt->execute();
 $blocks = $stmt->get_result();
 $aBlockData = $blocks->fetch_array();
 $stmt->close();
-
  */
+
 // Grab the last 10 blocks found
-$stmt = $mysqli->prepare("SELECT DISTINCT * FROM blocks ORDER BY height DESC LIMIT 10");
+$stmt = $mysqli->prepare("SELECT * FROM blocks ORDER BY height DESC LIMIT 10");
 $stmt->execute();
 $blocksfound = $stmt->get_result();
 $aBlocksFoundData = $blocksfound->fetch_all(MYSQLI_ASSOC);
diff --git a/public/templates/mmcFE/statistics/blocks/blocks_found.tpl b/public/templates/mmcFE/statistics/blocks/blocks_found.tpl
index 9fabfd93..f24a2698 100644
--- a/public/templates/mmcFE/statistics/blocks/blocks_found.tpl
+++ b/public/templates/mmcFE/statistics/blocks/blocks_found.tpl
@@ -16,7 +16,7 @@
       {assign var=user value="."|explode:$BLOCKSFOUND[block].username} 
       <tr class="{cycle values="odd,even"}">
         <td>{$BLOCKSFOUND[block].height}</td>
-        <td>{if $BLOCKSFOUND[block].confirmations >= 120}<font color="green">Confirmed</font>{else}<font color="orange">{$BLOCKSFOUND[block].confirms - 120} left</font>{/if}</td>
+        <td>{if $BLOCKSFOUND[block].confirmations >= 120}<font color="green">Confirmed</font>{else}<font color="orange">{120 - $BLOCKSFOUND[block].confirms} left</font>{/if}</td>
         <td>{$user.0|default:"unknown"}</td>
         <td>{$BLOCKSFOUND[block].time|date_format:"%d/%m/%Y %H:%M:%S"}</td>
         <td>{$BLOCKSFOUND[block].difficulty|number_format}</td>