From d59b8ef5638a0bf904ce8bea3a45873def95fd76 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Mon, 5 Aug 2013 09:18:52 +0200
Subject: [PATCH 01/39] Make block count on stats page configurable

Fixes #549
---
 public/include/config/global.inc.dist.php      | 3 +++
 public/include/pages/statistics/blocks.inc.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php
index 359f74da..265dfc7a 100644
--- a/public/include/config/global.inc.dist.php
+++ b/public/include/config/global.inc.dist.php
@@ -109,6 +109,7 @@ $config['ap_threshold']['max'] = 250;
  *   mobile         :  Enable/Disable mobile theme support
  *   mobile_theme   :  Theme used for mobile browsers
  *   api disabled   :  Disable the sites API functions
+ *   blocks count   :  # of blocks to display on block statistics page
  *
  * Defaults:
  *   title          =  `The Pool - Mining Evolved`
@@ -119,6 +120,7 @@ $config['ap_threshold']['max'] = 250;
  *   mobile         =  true
  *   mobile_theme   =  `mobile`
  *   api disbabled  =  false
+ *   blocks count   =  20
  **/
 $config['website']['title'] = 'The Pool - Mining Evolved';
 $config['website']['name'] = 'The Pool';
@@ -128,6 +130,7 @@ $config['website']['theme'] = 'mmcFE';
 $config['website']['mobile'] = true;
 $config['website']['mobile_theme'] = 'mobile';
 $config['website']['api']['disabled'] = false;
+$config['website']['blocks']['count'] = 20;
 
 /**
  * Account specific settings
diff --git a/public/include/pages/statistics/blocks.inc.php b/public/include/pages/statistics/blocks.inc.php
index 3218a9f4..494e6be3 100644
--- a/public/include/pages/statistics/blocks.inc.php
+++ b/public/include/pages/statistics/blocks.inc.php
@@ -7,7 +7,7 @@ if (!defined('SECURITY')) die('Hacking attempt');
 if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
   $debug->append('No cached version available, fetching from backend', 3);
   // Grab the last blocks found
-  $iLimit = 20;
+  !empty($config['website']['blocks']['count']) ? $iLimit = $config['website']['blocks']['count'] : $iLimit = 20;
   $aBlocksFoundData = $statistics->getBlocksFound($iLimit);
 
   // Propagate content our template

From 6dfce75df8f1aa97eba771dd299d6455c2ab34a2 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Wed, 7 Aug 2013 08:47:22 +0200
Subject: [PATCH 02/39] Skip proof-of-stake blocks in findblock cron

* Do not add proof-of-stake blocks to database

Fixes #569
---
 cronjobs/findblock.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cronjobs/findblock.php b/cronjobs/findblock.php
index 2643b1ba..79dadeba 100755
--- a/cronjobs/findblock.php
+++ b/cronjobs/findblock.php
@@ -58,6 +58,10 @@ if (empty($aTransactions['transactions'])) {
         $aData['confirmations'] . "\t\t" .
         $aData['difficulty'] . "\t" .
         strftime("%Y-%m-%d %H:%M:%S", $aData['time']));
+      if ( ! empty($aBlockInfo['flags']) && $aBlockInfo['flags'] == 'proof-of-stake' ) {
+        $logs->logInfo("Block above with height " .  $aData['height'] . " not added to database, proof-of-stake block!");
+        continue;
+      }
       if (!$block->addBlock($aData) ) {
         $log->logFatal('Unable to add this block to database: ' . $aData['height']);
       }

From 769a85cbc0970304901ebc858eeda707c7d096d6 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Wed, 7 Aug 2013 08:54:38 +0200
Subject: [PATCH 03/39] Deduct TXFee from transferred balance

This should fix #568 as proposed by @nicoschtein
---
 cronjobs/auto_payout.php   | 2 +-
 cronjobs/manual_payout.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cronjobs/auto_payout.php b/cronjobs/auto_payout.php
index 49984be6..5d646185 100755
--- a/cronjobs/auto_payout.php
+++ b/cronjobs/auto_payout.php
@@ -70,7 +70,7 @@ if (! empty($users)) {
 
       // Send balance, fees are reduced later by RPC Server
       try {
-        $bitcoin->sendtoaddress($aUserData['coin_address'], $dBalance);
+        $bitcoin->sendtoaddress($aUserData['coin_address'], $dBalance - $config['txfee']);
       } catch (BitcoinClientException $e) {
         $log->logError('Failed to send requested balance to coin address, please check payout process');
         continue;
diff --git a/cronjobs/manual_payout.php b/cronjobs/manual_payout.php
index 4624fc93..094d4c02 100755
--- a/cronjobs/manual_payout.php
+++ b/cronjobs/manual_payout.php
@@ -62,7 +62,7 @@ if (count($aPayouts) > 0) {
         continue;
       }
       try {
-        $bitcoin->sendtoaddress($aData['coin_address'], $dBalance);
+        $bitcoin->sendtoaddress($aData['coin_address'], $dBalance - $config['txfee']);
       } catch (BitcoinClientException $e) {
         $log->logError('Failed to send requested balance to coin address, please check payout process');
         continue;

From fafd75d994f58cca91ec0bdaa7b8f01d36d2d9b8 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Wed, 7 Aug 2013 08:59:22 +0200
Subject: [PATCH 04/39] Honor anonymous flag on mobile template

Fixes #535
---
 public/templates/mobile/statistics/blocks/default.tpl     | 2 +-
 public/templates/mobile/statistics/blocks/small_table.tpl | 2 +-
 .../mobile/statistics/pool/contributors_hashrate.tpl      | 2 +-
 .../mobile/statistics/pool/contributors_shares.tpl        | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/templates/mobile/statistics/blocks/default.tpl b/public/templates/mobile/statistics/blocks/default.tpl
index b4f29b00..e4aa759a 100644
--- a/public/templates/mobile/statistics/blocks/default.tpl
+++ b/public/templates/mobile/statistics/blocks/default.tpl
@@ -53,7 +53,7 @@ target and network difficulty and assuming a zero variance scenario.
         {else if $BLOCKSFOUND[block].confirmations == -1}
           <font color="red">Orphan</font>
         {else}{$GLOBAL.confirmations - $BLOCKSFOUND[block].confirmations} left{/if}</td>
-        <td>{$BLOCKSFOUND[block].finder|default:"unknown"}</td>
+        <td>{if $BLOCKSFOUND[block].is_anonymous|default:"0" == 1}anonymous{else}{$BLOCKSFOUND[block].finder|default:"unknown"|escape}{/if}</td>
         <td class="center">{$BLOCKSFOUND[block].time|date_format:"%d/%m %H:%M:%S"}</td>
         <td class="right">{$BLOCKSFOUND[block].difficulty|number_format:"2"}</td>
         <td class="right">{(pow(2,32 - $GLOBAL.config.targetdiff) * $BLOCKSFOUND[block].difficulty)|number_format}</td>
diff --git a/public/templates/mobile/statistics/blocks/small_table.tpl b/public/templates/mobile/statistics/blocks/small_table.tpl
index 2cfac05a..9ed3ec74 100644
--- a/public/templates/mobile/statistics/blocks/small_table.tpl
+++ b/public/templates/mobile/statistics/blocks/small_table.tpl
@@ -13,7 +13,7 @@
 {section block $BLOCKSFOUND}
       <tr class="{cycle values="odd,even"}">
         <th><a href="{$GLOBAL.blockexplorer}{$BLOCKSFOUND[block].height}" target="_blank">{$BLOCKSFOUND[block].height}</a></th>
-        <td>{$BLOCKSFOUND[block].finder|default:"unknown"}</td>
+        <td>{if $BLOCKSFOUND[block].is_anonymous|default:"0" == 1}anonymous{else}{$BLOCKSFOUND[block].finder|default:"unknown"|escape}{/if}</td>
         <td>{$BLOCKSFOUND[block].time|date_format:"%d/%m %H:%M"}</td>
         <td align="right">{$BLOCKSFOUND[block].shares|number_format}</td>
       </tr>
diff --git a/public/templates/mobile/statistics/pool/contributors_hashrate.tpl b/public/templates/mobile/statistics/pool/contributors_hashrate.tpl
index 15fae80a..811e20a7 100644
--- a/public/templates/mobile/statistics/pool/contributors_hashrate.tpl
+++ b/public/templates/mobile/statistics/pool/contributors_hashrate.tpl
@@ -16,7 +16,7 @@
       {if $GLOBAL.userdata.username == $CONTRIBSHARES[contrib].account}{assign var=listed value=1}{/if}
       <tr>
         <th>{$rank++}</th>
-        <td>{$CONTRIBHASHES[contrib].account}</td>
+        <td>{if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if}</td>
         <td align="right">{$CONTRIBHASHES[contrib].hashrate|number_format}</td>
         <td align="right">{$estday|number_format:"3"}</td>
         <td align="right">{($estday * $GLOBAL.price)|default:"n/a"|number_format:"2"}</td>
diff --git a/public/templates/mobile/statistics/pool/contributors_shares.tpl b/public/templates/mobile/statistics/pool/contributors_shares.tpl
index e23b3998..1025a28f 100644
--- a/public/templates/mobile/statistics/pool/contributors_shares.tpl
+++ b/public/templates/mobile/statistics/pool/contributors_shares.tpl
@@ -9,12 +9,12 @@
     <tbody>
 {assign var=rank value=1}
 {assign var=listed value=0}
-{section hashrate $CONTRIBSHARES}
-{if $GLOBAL.userdata.username == $CONTRIBSHARES[hashrate].account}{assign var=listed value=1}{/if}
+{section shares $CONTRIBSHARES}
+{if $GLOBAL.userdata.username == $CONTRIBSHARES[shares].account}{assign var=listed value=1}{/if}
       <tr>
         <th aign="center">{$rank++}</th>
-        <td>{$CONTRIBSHARES[hashrate].account}</td>
-        <td align="right">{$CONTRIBSHARES[hashrate].shares|number_format}</td>
+        <td>{if $CONTRIBSHARES[shares].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBSHARES[shares].account|escape}{/if}</td>
+        <td align="right">{$CONTRIBSHARES[shares].shares|number_format}</td>
       </tr>
 {/section}
 {if $listed != 1}

From 073a42cfc8b49c856cf72b7711c4aae161d24860 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Wed, 7 Aug 2013 09:20:08 +0200
Subject: [PATCH 05/39] Fixing worker hashrates and activity status

* Fix hashrate calculations and include archived shares
* Fix worker activity to only check for our_result = Y shares
* Mark as active if worker has a hashrate > 0, removes a query

Addresses #561, crons need to be updated to remove the active flag from
as the worker activity and check the hashrate instead.
---
 public/include/classes/worker.class.php       | 41 +++++++++++++++----
 .../mmcFE/account/workers/default.tpl         |  4 +-
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/public/include/classes/worker.class.php b/public/include/classes/worker.class.php
index 7643a6d1..a049f8ea 100644
--- a/public/include/classes/worker.class.php
+++ b/public/include/classes/worker.class.php
@@ -95,15 +95,27 @@ class Worker {
     $this->debug->append("STA " . __METHOD__, 4);
     $stmt = $this->mysqli->prepare("
        SELECT id, username, password, monitor,
-       ( SELECT SIGN(COUNT(id)) FROM " . $this->share->getTableName() . " WHERE username = $this->table.username AND time > DATE_SUB(now(), INTERVAL 10 MINUTE)) AS active,
-       ( SELECT ROUND(COUNT(id) * POW(2, " . $this->config['difficulty'] . ")/600/1000) FROM " . $this->share->getTableName() . " WHERE username = $this->table.username AND time > DATE_SUB(now(), INTERVAL 10 MINUTE)) AS hashrate
-       FROM $this->table
+       (
+         SELECT
+          IFNULL(IF(our_result='Y', ROUND(COUNT(id) * POW(2, " . $this->config['difficulty'] . ") / 600 / 1000), 0), 0) AS hashrate
+          FROM " . $this->share->getTableName() . "
+          WHERE
+            username = w.username
+          AND time > DATE_SUB(now(), INTERVAL 10 MINUTE)
+        ) + (
+         SELECT
+          IFNULL(IF(our_result='Y', ROUND(COUNT(id) * POW(2, " . $this->config['difficulty'] . ") / 600 / 1000), 0), 0) AS hashrate
+          FROM " . $this->share->getArchiveTableName() . "
+          WHERE
+            username = w.username
+          AND time > DATE_SUB(now(), INTERVAL 10 MINUTE)
+       ) AS hashrate
+       FROM $this->table AS w
        WHERE id = ?
        ");
     if ($this->checkStmt($stmt) && $stmt->bind_param('i', $id) && $stmt->execute() && $result = $stmt->get_result())
       return $result->fetch_assoc();
     // Catchall
-    echo $this->mysqli->error;
     return false;
   }
 
@@ -116,9 +128,22 @@ class Worker {
     $this->debug->append("STA " . __METHOD__, 4);
     $stmt = $this->mysqli->prepare("
       SELECT id, username, password, monitor,
-      ( SELECT SIGN(COUNT(id)) FROM " . $this->share->getTableName() . " WHERE our_result = 'Y' AND username = $this->table.username AND time > DATE_SUB(now(), INTERVAL 10 MINUTE)) AS active,
-      ( SELECT ROUND(COUNT(id) * POW(2, " . $this->config['difficulty'] . ")/600/1000) FROM " . $this->share->getTableName() . " WHERE our_result = 'Y' AND username = $this->table.username AND time > DATE_SUB(now(), INTERVAL 10 MINUTE)) AS hashrate
-      FROM $this->table
+       (
+         SELECT
+          IFNULL(IF(our_result='Y', ROUND(COUNT(id) * POW(2, " . $this->config['difficulty'] . ") / 600 / 1000), 0), 0) AS hashrate
+          FROM " . $this->share->getTableName() . "
+          WHERE
+            username = w.username
+          AND time > DATE_SUB(now(), INTERVAL 10 MINUTE)
+        ) + (
+         SELECT
+          IFNULL(IF(our_result='Y', ROUND(COUNT(id) * POW(2, " . $this->config['difficulty'] . ") / 600 / 1000), 0), 0) AS hashrate
+          FROM " . $this->share->getArchiveTableName() . "
+          WHERE
+            username = w.username
+          AND time > DATE_SUB(now(), INTERVAL 10 MINUTE)
+       ) AS hashrate
+      FROM $this->table AS w
       WHERE account_id = ?");
     if ($this->checkStmt($stmt) && $stmt->bind_param('i', $account_id) && $stmt->execute() && $result = $stmt->get_result())
       return $result->fetch_all(MYSQLI_ASSOC);
@@ -135,7 +160,7 @@ class Worker {
    **/
   public function getCountAllActiveWorkers() {
     $this->debug->append("STA " . __METHOD__, 4);
-    $stmt = $this->mysqli->prepare("SELECT IFNULL(COUNT(DISTINCT username), 0) AS total FROM "  . $this->share->getTableName() . " WHERE time > DATE_SUB(now(), INTERVAL 10 MINUTE)");
+    $stmt = $this->mysqli->prepare("SELECT IFNULL(IF(our_result='Y', COUNT(DISTINCT username), 0), 0) AS total FROM "  . $this->share->getTableName() . " WHERE time > DATE_SUB(now(), INTERVAL 10 MINUTE)");
     if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result())
       return $result->fetch_object()->total;
     return false;
diff --git a/public/templates/mmcFE/account/workers/default.tpl b/public/templates/mmcFE/account/workers/default.tpl
index 85862cf5..65635b4b 100644
--- a/public/templates/mmcFE/account/workers/default.tpl
+++ b/public/templates/mmcFE/account/workers/default.tpl
@@ -19,9 +19,9 @@
       {section worker $WORKERS}
       {assign var="username" value="."|escape|explode:$WORKERS[worker].username:2} 
       <tr>
-        <td{if $WORKERS[worker].active} style="color: orange"{/if}>{$username.0|escape}.<input name="data[{$WORKERS[worker].id}][username]" value="{$username.1|escape}" size="10" required/></td>
+        <td{if $WORKERS[worker].hashrate > 0} style="color: orange"{/if}>{$username.0|escape}.<input name="data[{$WORKERS[worker].id}][username]" value="{$username.1|escape}" size="10" required/></td>
         <td><input type="text" name="data[{$WORKERS[worker].id}][password]" value="{$WORKERS[worker].password|escape}" size="10" required></td>
-        <td class="center"><img src="{$PATH}/images/{if $WORKERS[worker].active}success{else}error{/if}.gif" /></td>
+        <td class="center"><img src="{$PATH}/images/{if $WORKERS[worker].hashrate > 0}success{else}error{/if}.gif" /></td>
         {if $GLOBAL.config.disable_notifications != 1}
         <td class="center">
           <input type="checkbox" name="data[{$WORKERS[worker].id}][monitor]" value="1" id="data[{$WORKERS[worker].id}][monitor]" {if $WORKERS[worker].monitor}checked{/if} />

From cbf39f7905b2c24c20be35789a2fd93bfbff2326 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Wed, 7 Aug 2013 09:27:50 +0200
Subject: [PATCH 06/39] Fix IDLE worker detection

* Also mark as IDLE if no valid shares were received

Fixes #561
---
 public/include/classes/worker.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/include/classes/worker.class.php b/public/include/classes/worker.class.php
index a049f8ea..88999e1c 100644
--- a/public/include/classes/worker.class.php
+++ b/public/include/classes/worker.class.php
@@ -75,14 +75,15 @@ class Worker {
     $this->debug->append("STA " . __METHOD__, 4);
     $stmt = $this->mysqli->prepare("
       SELECT account_id, id, username
-      FROM " . $this->table . "
-      WHERE monitor = 1 AND ( SELECT SIGN(COUNT(id)) FROM " . $this->share->getTableName() . " WHERE username = $this->table.username AND time > DATE_SUB(now(), INTERVAL 10 MINUTE)) = 0");
-
+      FROM " . $this->table . " AS w
+      WHERE monitor = 1
+      AND (
+        SELECT IFNULL(SIGN(IF(our_result = 'Y', COUNT(id), 0)), 0) FROM " . $this->share->getTableName() . " WHERE username = w.username AND time > DATE_SUB(now(), INTERVAL 10 MINUTE)
+      ) = 0");
     if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result())
       return $result->fetch_all(MYSQLI_ASSOC);
     // Catchall
     $this->setErrorMessage("Unable to fetch IDLE, monitored workers");
-    echo $this->mysqli->error;
     return false;
   }
 

From d5651764cd5b65c24e604747a6e4eb5b394861e3 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 8 Aug 2013 06:42:42 +0200
Subject: [PATCH 07/39] Update findblock.php

* fixed typo
---
 cronjobs/findblock.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cronjobs/findblock.php b/cronjobs/findblock.php
index 79dadeba..de18c3ce 100755
--- a/cronjobs/findblock.php
+++ b/cronjobs/findblock.php
@@ -59,7 +59,7 @@ if (empty($aTransactions['transactions'])) {
         $aData['difficulty'] . "\t" .
         strftime("%Y-%m-%d %H:%M:%S", $aData['time']));
       if ( ! empty($aBlockInfo['flags']) && $aBlockInfo['flags'] == 'proof-of-stake' ) {
-        $logs->logInfo("Block above with height " .  $aData['height'] . " not added to database, proof-of-stake block!");
+        $log->logInfo("Block above with height " .  $aData['height'] . " not added to database, proof-of-stake block!");
         continue;
       }
       if (!$block->addBlock($aData) ) {

From 03da52117a34b9c8e511fb37fd12dda324351493 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 8 Aug 2013 09:36:05 +0200
Subject: [PATCH 08/39] Fix user seeing other users transactions

Fixes #577
---
 public/include/classes/transaction.class.php | 26 +++++++++-----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/public/include/classes/transaction.class.php b/public/include/classes/transaction.class.php
index 6da0ee49..3bb3e2a0 100644
--- a/public/include/classes/transaction.class.php
+++ b/public/include/classes/transaction.class.php
@@ -72,52 +72,50 @@ class Transaction extends Base {
       FROM $this->table AS t
       LEFT JOIN " . $this->block->getTableName() . " AS b ON t.block_id = b.id
       LEFT JOIN " . $this->user->getTableName() . " AS a ON t.account_id = a.id";
+    if (!empty($account_id)) {
+      $sql .= " WHERE ( t.account_id = ? ) ";
+      $this->addParam('i', $account_id);
+    }
     if (is_array($filter)) {
       $aFilter = array();
       foreach ($filter as $key => $value) {
         if (!empty($value)) {
           switch ($key) {
           case 'type':
-            $aFilter[] = "t.type = ?";
+            $aFilter[] = "( t.type = ? )";
             $this->addParam('s', $value);
             break;
           case 'status':
             switch ($value) {
             case 'Confirmed':
               if (empty($filter['type']) || ($filter['type'] != 'Debit_AP' && $filter['type'] != 'Debit_MP' && $filter['type'] != 'TXFee' && $filter['type'] != 'Credit_PPS' && $filter['type'] != 'Fee_PPS' && $filter['type'] != 'Donation_PPS')) {
-                $aFilter[] = "b.confirmations >= " . $this->config['confirmations'] . " OR ISNULL(b.confirmations)";
+                $aFilter[] = "( b.confirmations >= " . $this->config['confirmations'] . " OR ISNULL(b.confirmations) )";
               }
                 break;
             case 'Unconfirmed':
-              $aFilter[] = "b.confirmations < " . $this->config['confirmations'] . " AND b.confirmations >= 0";
+              $aFilter[] = "( b.confirmations < " . $this->config['confirmations'] . " AND b.confirmations >= 0 )";
                 break;
             case 'Orphan':
-              $aFilter[] = "b.confirmations = -1";
+              $aFilter[] = "( b.confirmations = -1 )";
                 break;
             }
             break;
             case 'account':
-              $aFilter[] = "LOWER(a.username) = LOWER(?)";
+              $aFilter[] = "( LOWER(a.username) = LOWER(?) )";
               $this->addParam('s', $value);
               break;
             case 'address':
-              $aFilter[] = "t.coin_address = ?";
+              $aFilter[] = "( t.coin_address = ? )";
               $this->addParam('s', $value);
               break;
           }
         }
       }
       if (!empty($aFilter)) {
-        $sql .= " WHERE " . implode(' AND ', $aFilter);
+	empty($account_id) ? $sql .= " WHERE " : $sql .= " AND ";
+        $sql .= implode(' AND ', $aFilter);
       }
     }
-    if (is_int($account_id) && empty($aFilter)) {
-      $sql .= " WHERE a.id = ?";
-      $this->addParam('i', $account_id);
-    } else if (is_int($account_id)) {
-      $sql .= " AND a.id = ?";
-      $this->addParam('i', $account_id);
-    }
     $sql .= "
       ORDER BY id DESC
       LIMIT ?,?

From aad8271a13fc3cc430618a00043bc90a3d86436d Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 8 Aug 2013 09:42:10 +0200
Subject: [PATCH 09/39] Fix blockexplorer links to use blockhash not height

Fixes #571
---
 public/templates/mmcFE/statistics/blocks/default.tpl     | 2 +-
 public/templates/mmcFE/statistics/blocks/small_table.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/templates/mmcFE/statistics/blocks/default.tpl b/public/templates/mmcFE/statistics/blocks/default.tpl
index 2871cd01..72b3fc48 100644
--- a/public/templates/mmcFE/statistics/blocks/default.tpl
+++ b/public/templates/mmcFE/statistics/blocks/default.tpl
@@ -50,7 +50,7 @@ target and network difficulty and assuming a zero variance scenario.
 {assign var=rank value=1}
 {section block $BLOCKSFOUND}
       <tr class="{cycle values="odd,even"}">
-        <td class="center"><a href="{$GLOBAL.blockexplorer}{$BLOCKSFOUND[block].height}" target="_blank">{$BLOCKSFOUND[block].height}</a></td>
+        <td class="center"><a href="{$GLOBAL.blockexplorer}{$BLOCKSFOUND[block].blockhash}" target="_blank">{$BLOCKSFOUND[block].height}</a></td>
         <td class="center">
         {if $BLOCKSFOUND[block].confirmations >= $GLOBAL.confirmations}
           <font color="green">Confirmed</font>
diff --git a/public/templates/mmcFE/statistics/blocks/small_table.tpl b/public/templates/mmcFE/statistics/blocks/small_table.tpl
index 010b3557..7ddc03c8 100644
--- a/public/templates/mmcFE/statistics/blocks/small_table.tpl
+++ b/public/templates/mmcFE/statistics/blocks/small_table.tpl
@@ -13,7 +13,7 @@
 {assign var=rank value=1}
 {section block $BLOCKSFOUND}
       <tr class="{cycle values="odd,even"}">
-        <td class="center"><a href="{$GLOBAL.blockexplorer}{$BLOCKSFOUND[block].height}" target="_blank">{$BLOCKSFOUND[block].height}</a></td>
+        <td class="center"><a href="{$GLOBAL.blockexplorer}{$BLOCKSFOUND[block].blockhash}" target="_new">{$BLOCKSFOUND[block].height}</a></td>
         <td>{if $BLOCKSFOUND[block].is_anonymous|default:"0" == 1}anonymous{else}{$BLOCKSFOUND[block].finder|default:"unknown"|escape}{/if}</td>
         <td class="center">{$BLOCKSFOUND[block].time|date_format:"%d/%m %H:%M:%S"}</td>
         <td class="right">{$BLOCKSFOUND[block].shares|number_format}</td>

From 92623902b2d93675e42c2af520d9f6b29b934b03 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 8 Aug 2013 10:03:33 +0200
Subject: [PATCH 10/39] adding round shares back to PPS sidebar

---
 public/templates/mmcFE/global/sidebar_pps.tpl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/templates/mmcFE/global/sidebar_pps.tpl b/public/templates/mmcFE/global/sidebar_pps.tpl
index 3fdc478a..1268880a 100644
--- a/public/templates/mmcFE/global/sidebar_pps.tpl
+++ b/public/templates/mmcFE/global/sidebar_pps.tpl
@@ -28,6 +28,10 @@
                       <td><b>Pool Valid</b></td>
                       <td class="right"><i>{$GLOBAL.roundshares.valid|number_format}</i></td>
                     </tr>
+                    <tr>
+                      <td><b>Your Valid</b></td>
+                      <td class="right"><i>{$GLOBAL.userdata.shares.valid|number_format}</i></td>
+                    </tr>
                     <tr>
                       <td><b>Pool Invalid</b></td>
                       <td class="right"><i>{$GLOBAL.roundshares.invalid|number_format}</i>{if $GLOBAL.roundshares.valid > 0}<font size='1px'> ({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%)</font>{/if}</td>

From 1a459a7913f9bc963ee3bfa1593a28d4b736d7af Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 8 Aug 2013 12:02:39 +0200
Subject: [PATCH 11/39] Adding transaction summary by types

Addresses #581
---
 public/include/classes/base.class.php         |  3 ++
 public/include/classes/transaction.class.php  | 32 +++++++++++++++++++
 .../pages/account/transactions.inc.php        |  2 ++
 .../include/pages/admin/transactions.inc.php  |  2 ++
 .../mmcFE/account/transactions/default.tpl    | 19 +++++++++++
 .../mmcFE/admin/transactions/default.tpl      | 19 +++++++++++
 6 files changed, 77 insertions(+)

diff --git a/public/include/classes/base.class.php b/public/include/classes/base.class.php
index aea25d60..6dc88b02 100644
--- a/public/include/classes/base.class.php
+++ b/public/include/classes/base.class.php
@@ -103,6 +103,9 @@ class Base {
   }
   public function getParam() {
     $array = array_merge(array($this->types), $this->values);
+    // Clear the data
+    $this->values = NULL;
+    $this->types = NULL;
     // See here why we need this: http://stackoverflow.com/questions/16120822/mysqli-bind-param-expected-to-be-a-reference-value-given
     if (strnatcmp(phpversion(),'5.3') >= 0) {
       $refs = array();
diff --git a/public/include/classes/transaction.class.php b/public/include/classes/transaction.class.php
index 3bb3e2a0..b706f7e4 100644
--- a/public/include/classes/transaction.class.php
+++ b/public/include/classes/transaction.class.php
@@ -47,6 +47,38 @@ class Transaction extends Base {
     return false;
   }
 
+  /**
+   * Fetch a transaction summary by type with total amounts
+   * @param account_id int Account ID, NULL for all
+   * @return data array type and total
+   **/
+  public function getTransactionSummary($account_id=NULL) {
+    $sql = "SELECT SUM(t.amount) AS total, t.type AS type FROM $this->table AS t";
+    if (!empty($account_id)) {
+      $sql .= " WHERE t.account_id = ? ";
+      $this->addParam('i', $account_id);
+    }
+    $sql .= " GROUP BY t.type";
+    $stmt = $this->mysqli->prepare($sql);
+    if (!empty($account_id)) {
+      if (!($this->checkStmt($stmt) && call_user_func_array( array($stmt, 'bind_param'), $this->getParam()) && $stmt->execute()))
+        return false;
+      $result = $stmt->get_result();
+    } else {
+      if (!($this->checkStmt($stmt) && $stmt->execute()))
+        return false;
+      $result = $stmt->get_result();
+    }
+    if ($result) {
+      $aData = NULL;
+      while ($row = $result->fetch_assoc()) {
+        $aData[$row['type']] = $row['total'];
+      }
+      return $aData;
+    }
+    return false;
+  }
+
   /**
    * Get all transactions from start for account_id
    * @param start int Starting point, id of transaction
diff --git a/public/include/pages/account/transactions.inc.php b/public/include/pages/account/transactions.inc.php
index bd8f2aa4..a06eae61 100644
--- a/public/include/pages/account/transactions.inc.php
+++ b/public/include/pages/account/transactions.inc.php
@@ -6,11 +6,13 @@ if ($user->isAuthenticated()) {
   $iLimit = 30;
   empty($_REQUEST['start']) ? $start = 0 : $start = $_REQUEST['start'];
   $aTransactions = $transaction->getTransactions($start, @$_REQUEST['filter'], $iLimit, $_SESSION['USERDATA']['id']);
+  $aTransactionSummary = $transaction->getTransactionSummary($_SESSION['USERDATA']['id']);
   $iCountTransactions = $transaction->num_rows;
   $aTransactionTypes = $transaction->getTypes();
   if (!$aTransactions) $_SESSION['POPUP'][] = array('CONTENT' => 'Could not find any transaction', 'TYPE' => 'errormsg');
   $smarty->assign('LIMIT', $iLimit);
   $smarty->assign('TRANSACTIONS', $aTransactions);
+  $smarty->assign('SUMMARY', $aTransactionSummary);
   $smarty->assign('TRANSACTIONTYPES', $aTransactionTypes);
   $smarty->assign('TXSTATUS', array('' => '', 'Confirmed' => 'Confirmed', 'Unconfirmed' => 'Unconfirmed', 'Orphan' => 'Orphan'));
   $smarty->assign('COUNTTRANSACTIONS', $iCountTransactions);
diff --git a/public/include/pages/admin/transactions.inc.php b/public/include/pages/admin/transactions.inc.php
index 505f25ab..92cdd2d8 100644
--- a/public/include/pages/admin/transactions.inc.php
+++ b/public/include/pages/admin/transactions.inc.php
@@ -14,11 +14,13 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
   $debug->append('No cached version available, fetching from backend', 3);
   empty($_REQUEST['start']) ? $start = 0 : $start = $_REQUEST['start'];
   $aTransactions = $transaction->getTransactions($start, @$_REQUEST['filter'], $iLimit);
+  $aTransactionSummary = $transaction->getTransactionSummary($_SESSION['USERDATA']['id']);
   $iCountTransactions = $transaction->num_rows;
   $aTransactionTypes = $transaction->getTypes();
   if (!$aTransactions) $_SESSION['POPUP'][] = array('CONTENT' => 'Could not find any transaction', 'TYPE' => 'errormsg');
   $smarty->assign('LIMIT', $iLimit);
   $smarty->assign('TRANSACTIONS', $aTransactions);
+  $smarty->assign('SUMMARY', $aTransactionSummary);
   $smarty->assign('TRANSACTIONTYPES', $aTransactionTypes);
   $smarty->assign('TXSTATUS', array('' => '', 'Confirmed' => 'Confirmed', 'Unconfirmed' => 'Unconfirmed', 'Orphan' => 'Orphan'));
   $smarty->assign('COUNTTRANSACTIONS', $iCountTransactions);
diff --git a/public/templates/mmcFE/account/transactions/default.tpl b/public/templates/mmcFE/account/transactions/default.tpl
index 5563aee4..62a32a17 100644
--- a/public/templates/mmcFE/account/transactions/default.tpl
+++ b/public/templates/mmcFE/account/transactions/default.tpl
@@ -1,3 +1,22 @@
+{include file="global/block_header.tpl" BLOCK_HEADER="Transaction Summary"}
+<table>
+  <thead>
+    <tr>
+    {foreach $SUMMARY as $type=>$total}
+      <th>{$type}</th>
+    {/foreach}
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+    {foreach $SUMMARY as $type=>$total}
+      <td class="right">{$total}</td>
+    {/foreach}
+    </tr>
+  </tbody>
+</table>
+{include file="global/block_footer.tpl"}
+
 {include file="global/block_header.tpl" ALIGN="left" BLOCK_STYLE="width: 23%" BLOCK_HEADER="Transaction Filter"}
 <form action="{$smarty.server.PHP_SELF}">
   <input type="hidden" name="page" value="{$smarty.request.page}" />
diff --git a/public/templates/mmcFE/admin/transactions/default.tpl b/public/templates/mmcFE/admin/transactions/default.tpl
index cbbc7e86..cc2693d9 100644
--- a/public/templates/mmcFE/admin/transactions/default.tpl
+++ b/public/templates/mmcFE/admin/transactions/default.tpl
@@ -1,3 +1,22 @@
+{include file="global/block_header.tpl" BLOCK_HEADER="Transaction Summary"}
+<table>
+  <thead>
+    <tr>
+    {foreach $SUMMARY as $type=>$total}
+      <th>{$type}</th>
+    {/foreach}
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+    {foreach $SUMMARY as $type=>$total}
+      <td class="right">{$total}</td>
+    {/foreach}
+    </tr>
+  </tbody>
+</table>
+{include file="global/block_footer.tpl"}
+
 {include file="global/block_header.tpl" ALIGN="left" BLOCK_STYLE="width: 23%" BLOCK_HEADER="Transaction Filter"}
 <form action="{$smarty.server.PHP_SELF}">
   <input type="hidden" name="page" value="{$smarty.request.page}" />

From 031b4940cdec89bc7a200e057198e79a76718a9d Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 8 Aug 2013 12:05:06 +0200
Subject: [PATCH 12/39] admin should see all transactions in summary

---
 public/include/pages/admin/transactions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/include/pages/admin/transactions.inc.php b/public/include/pages/admin/transactions.inc.php
index 92cdd2d8..5b544da6 100644
--- a/public/include/pages/admin/transactions.inc.php
+++ b/public/include/pages/admin/transactions.inc.php
@@ -14,7 +14,7 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
   $debug->append('No cached version available, fetching from backend', 3);
   empty($_REQUEST['start']) ? $start = 0 : $start = $_REQUEST['start'];
   $aTransactions = $transaction->getTransactions($start, @$_REQUEST['filter'], $iLimit);
-  $aTransactionSummary = $transaction->getTransactionSummary($_SESSION['USERDATA']['id']);
+  $aTransactionSummary = $transaction->getTransactionSummary();
   $iCountTransactions = $transaction->num_rows;
   $aTransactionTypes = $transaction->getTypes();
   if (!$aTransactions) $_SESSION['POPUP'][] = array('CONTENT' => 'Could not find any transaction', 'TYPE' => 'errormsg');

From d42b66d94e589f307a22e9bd2ca11f5fe8b3a9eb Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 8 Aug 2013 12:09:50 +0200
Subject: [PATCH 13/39] removing useless strings

---
 public/templates/mmcFE/account/transactions/default.tpl | 4 ++--
 public/templates/mmcFE/admin/transactions/default.tpl   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/templates/mmcFE/account/transactions/default.tpl b/public/templates/mmcFE/account/transactions/default.tpl
index 62a32a17..169e7de2 100644
--- a/public/templates/mmcFE/account/transactions/default.tpl
+++ b/public/templates/mmcFE/account/transactions/default.tpl
@@ -44,11 +44,11 @@
         </td>
       </tr>
         <tr>
-          <td class="left">TX Type</td>
+          <td class="left">Type</td>
           <td class="right">{html_options name="filter[type]" options=$TRANSACTIONTYPES selected=$smarty.request.filter.type|default:""}</td>
         </tr>
         <tr>
-          <td class="left">TX Status</td>
+          <td class="left">Status</td>
           <td class="right">{html_options name="filter[status]" options=$TXSTATUS selected=$smarty.request.filter.status|default:""}</td>
         </tr>
         <tr>
diff --git a/public/templates/mmcFE/admin/transactions/default.tpl b/public/templates/mmcFE/admin/transactions/default.tpl
index cc2693d9..cb066607 100644
--- a/public/templates/mmcFE/admin/transactions/default.tpl
+++ b/public/templates/mmcFE/admin/transactions/default.tpl
@@ -44,11 +44,11 @@
         </td>
       </tr>
         <tr>
-          <td class="left">TX Type</td>
+          <td class="left">Type</td>
           <td class="right">{html_options name="filter[type]" options=$TRANSACTIONTYPES selected=$smarty.request.filter.type|default:""}</td>
         </tr>
         <tr>
-          <td class="left">TX Status</td>
+          <td class="left">Status</td>
           <td class="right">{html_options name="filter[status]" options=$TXSTATUS selected=$smarty.request.filter.status|default:""}</td>
         </tr>
         <tr>

From 7214d27d9e3db0f94a147e109a0476d666469963 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Fri, 9 Aug 2013 14:58:46 +0200
Subject: [PATCH 14/39] make blocks list sortable

---
 public/templates/mmcFE/statistics/blocks/default.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/mmcFE/statistics/blocks/default.tpl b/public/templates/mmcFE/statistics/blocks/default.tpl
index 72b3fc48..c305d5a1 100644
--- a/public/templates/mmcFE/statistics/blocks/default.tpl
+++ b/public/templates/mmcFE/statistics/blocks/default.tpl
@@ -32,7 +32,7 @@ target and network difficulty and assuming a zero variance scenario.
 
 {include file="global/block_header.tpl" BLOCK_HEADER="Last $BLOCKLIMIT Blocks Found" BLOCK_STYLE="clear:none;"}
 <center>
-  <table width="100%" style="font-size:13px;">
+  <table width="100%" class="sortable" style="font-size:13px;">
     <thead>
       <tr style="background-color:#B6DAFF;">
         <th class="center">Block</th>

From 581888fe1fa8b84a23d3d8284712ca21ca01be30 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Mon, 12 Aug 2013 08:45:25 +0200
Subject: [PATCH 15/39] Update POOLS.md

---
 POOLS.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/POOLS.md b/POOLS.md
index f8321f31..21c0f83f 100644
--- a/POOLS.md
+++ b/POOLS.md
@@ -96,3 +96,9 @@ Small Time Miners are running various stratum only pools for different coins.
 | -------- | ---- | ------------: | ------------------: | ----- |
 | http://www.litecoinfor.me | Litecoin | 0 | 0 | |
 | http://www.fastcoinfor.me | Fastcoin | 0.830 MHash | 2 | |
+
+### ZC
+
+| Pool URL | Coin | Avg. Hashrate | Avg. Active Workers | Notes |
+| -------- | ---- | ------------: | ------------------: | ----- |
+| https://ltc.hashfaster.com | LTC | 70 MHash | 80 | Custom Template |

From 68f2d72cac73b90a9c3fdfcc994d94a5119caeea Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Mon, 12 Aug 2013 08:48:30 +0200
Subject: [PATCH 16/39] use regexp detection

---
 cronjobs/findblock.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cronjobs/findblock.php b/cronjobs/findblock.php
index 79dadeba..d5215f87 100755
--- a/cronjobs/findblock.php
+++ b/cronjobs/findblock.php
@@ -58,7 +58,7 @@ if (empty($aTransactions['transactions'])) {
         $aData['confirmations'] . "\t\t" .
         $aData['difficulty'] . "\t" .
         strftime("%Y-%m-%d %H:%M:%S", $aData['time']));
-      if ( ! empty($aBlockInfo['flags']) && $aBlockInfo['flags'] == 'proof-of-stake' ) {
+      if ( ! empty($aBlockInfo['flags']) && preg_match('/proof-of-stake/', $aBlockInfo['flags']) ) {
         $logs->logInfo("Block above with height " .  $aData['height'] . " not added to database, proof-of-stake block!");
         continue;
       }

From f3a0cf04178bc19f40e19385ebaa0367b02ff5d3 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Mon, 12 Aug 2013 09:35:45 +0200
Subject: [PATCH 17/39] Fixing PPLNS payouts when exceeding target

Round shares are taken to only match PPLNS target. Round target was not
re-adjusted to reflect the new, lower amount of round shares.

* Fix: Properly adjust round target shares when exceeding PPLNS target

Fixes #588 once merged
---
 cronjobs/pplns_payout.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/cronjobs/pplns_payout.php b/cronjobs/pplns_payout.php
index d6d00c9d..c71f5659 100755
--- a/cronjobs/pplns_payout.php
+++ b/cronjobs/pplns_payout.php
@@ -73,6 +73,8 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
         $monitoring->setStatus($cron_name . "_status", "okerror", 1); 
         exit(1);
       }
+      $log->logInfo('Adjusting round target to PPLNS target ' . $pplns_target);
+      $iRoundShares = $pplns_target;
     } else {
       $log->logDebug("Not able to match PPLNS target of $pplns_target with $iRoundShares");
       // We need to fill up with archived shares
@@ -124,26 +126,26 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
     // Loop through all accounts that have found shares for this round
     foreach ($aAccountShares as $key => $aData) {
       // Payout based on PPLNS target shares, proportional payout for all users
-      $aData['percentage'] = number_format(round(( 100 / $iRoundShares) * $aData['valid'], 8), 8);
-      $aData['payout'] = number_format(round(( $aData['percentage'] / 100 ) * $dReward, 8), 8);
+      $aData['percentage'] = round(( 100 / $iRoundShares) * $aData['valid'], 8);
+      $aData['payout'] = round(( $aData['percentage'] / 100 ) * $dReward, 8);
       // Defaults
       $aData['fee' ] = 0;
       $aData['donation'] = 0;
 
       if ($config['fees'] > 0 && $aData['no_fees'] == 0)
-        $aData['fee'] = number_format(round($config['fees'] / 100 * $aData['payout'], 8), 8);
+        $aData['fee'] = round($config['fees'] / 100 * $aData['payout'], 8);
       // Calculate donation amount, fees not included
-      $aData['donation'] = number_format(round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 8), 8);
+      $aData['donation'] = round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 8);
 
       // Verbose output of this users calculations
       $log->logInfo($aData['id'] . "\t" .
         $aData['username'] . "\t" .
         $aData['valid'] . "\t" .
         $aData['invalid'] . "\t" .
-        $aData['percentage'] . "\t" .
-        $aData['payout'] . "\t" .
-        $aData['donation'] . "\t" .
-        $aData['fee']);
+        number_format($aData['percentage'], 8) . "\t" .
+        number_format($aData['payout'], 8) . "\t" .
+        number_format($aData['donation'], 8) . "\t" .
+        number_format($aData['fee'], 8));
 
       // Add full round share statistics, not just PPLNS
       foreach ($aRoundAccountShares as $key => $aRoundData) {

From 85e22bc02f2a9fabb4e57eb47d1513ceaf45ddce Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Mon, 12 Aug 2013 10:07:19 +0200
Subject: [PATCH 18/39] Adding totals to block statistics

* Total expected shares
* Total actual shares
* Average Percentage
---
 public/templates/mmcFE/statistics/blocks/default.tpl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/public/templates/mmcFE/statistics/blocks/default.tpl b/public/templates/mmcFE/statistics/blocks/default.tpl
index c305d5a1..47f610c5 100644
--- a/public/templates/mmcFE/statistics/blocks/default.tpl
+++ b/public/templates/mmcFE/statistics/blocks/default.tpl
@@ -49,6 +49,7 @@ target and network difficulty and assuming a zero variance scenario.
     <tbody>
 {assign var=rank value=1}
 {section block $BLOCKSFOUND}
+      {assign var="totalshares" value=$totalshares+$BLOCKSFOUND[block].shares}
       <tr class="{cycle values="odd,even"}">
         <td class="center"><a href="{$GLOBAL.blockexplorer}{$BLOCKSFOUND[block].blockhash}" target="_blank">{$BLOCKSFOUND[block].height}</a></td>
         <td class="center">
@@ -63,6 +64,7 @@ target and network difficulty and assuming a zero variance scenario.
         <td class="right">{$BLOCKSFOUND[block].amount|number_format:"2"}</td>
         <td class="right">
           {math assign="estshares" equation="(pow(2,32 - targetdiff) * blockdiff)" targetdiff=$GLOBAL.config.targetdiff blockdiff=$BLOCKSFOUND[block].difficulty}
+      	  {assign var="totalexpectedshares" value=$totalexpectedshares+$estshares}
           {$estshares|number_format}
         </td>
         <td class="right">{$BLOCKSFOUND[block].shares|number_format}</td>
@@ -72,6 +74,13 @@ target and network difficulty and assuming a zero variance scenario.
         </td>
       </tr>
 {/section}
+    <tr>
+      <td colspan="6" class="right"><b>Totals</b></td>
+      <td class="right">{$totalexpectedshares|number_format}</td>
+      <td class="right">{$totalshares|number_format}</td>
+      {math assign="totalpercentage" equation="shares / estshares * 100" shares=$totalshares estshares=$totalexpectedshares}
+      <td class="right"><font color="{if ($percentage <= 100)}green{else}red{/if}">{$totalpercentage|number_format:"2"}</font>
+    </tr>
     </tbody>
   </table>
 </center>

From 80d2cda39905638249e87da519220eb7692deae7 Mon Sep 17 00:00:00 2001
From: Nicolas Schteinschraber <nicoschtein@gmail.com>
Date: Mon, 12 Aug 2013 22:55:40 -0300
Subject: [PATCH 19/39] Sustract fee to manual_payout cron too.

---
 cronjobs/manual_payout.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cronjobs/manual_payout.php b/cronjobs/manual_payout.php
index fbd4d927..41b1629a 100755
--- a/cronjobs/manual_payout.php
+++ b/cronjobs/manual_payout.php
@@ -62,7 +62,7 @@ if (count($aPayouts) > 0) {
         continue;
       }
       try {
-        $bitcoin->sendtoaddress($aData['coin_address'], $dBalance);
+        $bitcoin->sendtoaddress($aData['coin_address'], $dBalance - $config['txfee']);
       } catch (BitcoinClientException $e) {
         $log->logError('Failed to send requested balance to coin address, please check payout process');
         continue;

From 22e7904da7e798212975bce70a88f6122e2c45d6 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Tue, 13 Aug 2013 09:20:06 +0200
Subject: [PATCH 20/39] Fixing round estimates on public stats page

* Fix: Display round restimates when making pool stats public via ACL
* Fix: Display proper pool efficiency when pool stats are public

Fixes #585
---
 public/include/smarty_globals.inc.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php
index 64dcf2dc..7ddeb583 100644
--- a/public/include/smarty_globals.inc.php
+++ b/public/include/smarty_globals.inc.php
@@ -12,14 +12,13 @@ $dDifficulty = 1;
 $aRoundShares = 1;
 
 // Only run these if the user is logged in
-if (@$_SESSION['AUTHENTICATED']) {
-  $aRoundShares = $statistics->getRoundShares();
-  if ($bitcoin->can_connect() === true) {
-    $dDifficulty = $bitcoin->query('getdifficulty');
-    if (is_array($dDifficulty) && array_key_exists('proof-of-work', $dDifficulty))
-      $dDifficulty = $dDifficulty['proof-of-work'];
-  }
+$aRoundShares = $statistics->getRoundShares();
+if ($bitcoin->can_connect() === true) {
+  $dDifficulty = $bitcoin->query('getdifficulty');
+  if (is_array($dDifficulty) && array_key_exists('proof-of-work', $dDifficulty))
+    $dDifficulty = $dDifficulty['proof-of-work'];
 }
+
 // Always fetch this since we need for ministats header
 $bitcoin->can_connect() === true ? $dNetworkHashrate = $bitcoin->query('getnetworkhashps') : $dNetworkHashrate = 0;
 

From c0e84595196045bf3648bd7e2088c3fc21f18ad6 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Wed, 14 Aug 2013 10:59:50 +0200
Subject: [PATCH 21/39] fix coloring of total percentage

---
 public/templates/mmcFE/statistics/blocks/default.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/mmcFE/statistics/blocks/default.tpl b/public/templates/mmcFE/statistics/blocks/default.tpl
index 47f610c5..eea09ffb 100644
--- a/public/templates/mmcFE/statistics/blocks/default.tpl
+++ b/public/templates/mmcFE/statistics/blocks/default.tpl
@@ -79,7 +79,7 @@ target and network difficulty and assuming a zero variance scenario.
       <td class="right">{$totalexpectedshares|number_format}</td>
       <td class="right">{$totalshares|number_format}</td>
       {math assign="totalpercentage" equation="shares / estshares * 100" shares=$totalshares estshares=$totalexpectedshares}
-      <td class="right"><font color="{if ($percentage <= 100)}green{else}red{/if}">{$totalpercentage|number_format:"2"}</font>
+      <td class="right"><font color="{if ($totalpercentage <= 100)}green{else}red{/if}">{$totalpercentage|number_format:"2"}</font>
     </tr>
     </tbody>
   </table>

From 0679601fbdf97b4a346bbaa8d2a0bf41076b65f2 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Wed, 14 Aug 2013 11:03:56 +0200
Subject: [PATCH 22/39] Initilize totals with 0 values

Addresses #596
---
 public/templates/mmcFE/statistics/blocks/default.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/templates/mmcFE/statistics/blocks/default.tpl b/public/templates/mmcFE/statistics/blocks/default.tpl
index eea09ffb..fb2a799d 100644
--- a/public/templates/mmcFE/statistics/blocks/default.tpl
+++ b/public/templates/mmcFE/statistics/blocks/default.tpl
@@ -48,6 +48,8 @@ target and network difficulty and assuming a zero variance scenario.
     </thead>
     <tbody>
 {assign var=rank value=1}
+{assign var=totalexpectedshares value=0}
+{assign var=totalshares value=0}
 {section block $BLOCKSFOUND}
       {assign var="totalshares" value=$totalshares+$BLOCKSFOUND[block].shares}
       <tr class="{cycle values="odd,even"}">

From 567b8e165554a2abd9ca3fa92eb15d7d133a02bd Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Wed, 14 Aug 2013 11:10:58 +0200
Subject: [PATCH 23/39] Fix rounding issues on total row

* Use actual percentages to calculate the total to ensure
  the rows average matches the totals average

Fixes #596
---
 public/templates/mmcFE/statistics/blocks/default.tpl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/templates/mmcFE/statistics/blocks/default.tpl b/public/templates/mmcFE/statistics/blocks/default.tpl
index fb2a799d..87b9ecb5 100644
--- a/public/templates/mmcFE/statistics/blocks/default.tpl
+++ b/public/templates/mmcFE/statistics/blocks/default.tpl
@@ -47,11 +47,13 @@ target and network difficulty and assuming a zero variance scenario.
       </tr>
     </thead>
     <tbody>
-{assign var=rank value=1}
+{assign var=count value=0}
 {assign var=totalexpectedshares value=0}
 {assign var=totalshares value=0}
+{assign var=totalpercentage value=0}
 {section block $BLOCKSFOUND}
       {assign var="totalshares" value=$totalshares+$BLOCKSFOUND[block].shares}
+      {assign var="count" value=$count+1}
       <tr class="{cycle values="odd,even"}">
         <td class="center"><a href="{$GLOBAL.blockexplorer}{$BLOCKSFOUND[block].blockhash}" target="_blank">{$BLOCKSFOUND[block].height}</a></td>
         <td class="center">
@@ -72,6 +74,7 @@ target and network difficulty and assuming a zero variance scenario.
         <td class="right">{$BLOCKSFOUND[block].shares|number_format}</td>
         <td class="right">
           {math assign="percentage" equation="shares / estshares * 100" shares=$BLOCKSFOUND[block].shares estshares=$estshares}
+	  {assign var="totalpercentage" value=$totalpercentage+$percentage}
           <font color="{if ($percentage <= 100)}green{else}red{/if}">{$percentage|number_format:"2"}</font>
         </td>
       </tr>
@@ -80,8 +83,7 @@ target and network difficulty and assuming a zero variance scenario.
       <td colspan="6" class="right"><b>Totals</b></td>
       <td class="right">{$totalexpectedshares|number_format}</td>
       <td class="right">{$totalshares|number_format}</td>
-      {math assign="totalpercentage" equation="shares / estshares * 100" shares=$totalshares estshares=$totalexpectedshares}
-      <td class="right"><font color="{if ($totalpercentage <= 100)}green{else}red{/if}">{$totalpercentage|number_format:"2"}</font>
+      <td class="right"><font color="{if ($totalpercentage <= 100)}green{else}red{/if}">{($totalpercentage / $count)|number_format:"2"}</font>
     </tr>
     </tbody>
   </table>

From 184ad5d58bdae95c508fc8e2e8fd0b7f7ac5c047 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Wed, 14 Aug 2013 11:15:49 +0200
Subject: [PATCH 24/39] fixing color of total percentage again

---
 public/templates/mmcFE/statistics/blocks/default.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/mmcFE/statistics/blocks/default.tpl b/public/templates/mmcFE/statistics/blocks/default.tpl
index 87b9ecb5..8aeb21e6 100644
--- a/public/templates/mmcFE/statistics/blocks/default.tpl
+++ b/public/templates/mmcFE/statistics/blocks/default.tpl
@@ -83,7 +83,7 @@ target and network difficulty and assuming a zero variance scenario.
       <td colspan="6" class="right"><b>Totals</b></td>
       <td class="right">{$totalexpectedshares|number_format}</td>
       <td class="right">{$totalshares|number_format}</td>
-      <td class="right"><font color="{if ($totalpercentage <= 100)}green{else}red{/if}">{($totalpercentage / $count)|number_format:"2"}</font>
+      <td class="right"><font color="{if (($totalpercentage / $count) <= 100)}green{else}red{/if}">{($totalpercentage / $count)|number_format:"2"}</font>
     </tr>
     </tbody>
   </table>

From a10b5099ce1cc8dfd5caaec7ffa7846e33350168 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Wed, 14 Aug 2013 11:21:21 +0200
Subject: [PATCH 25/39] Update POOLS.md

Added @nutnut pools
---
 POOLS.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/POOLS.md b/POOLS.md
index 21c0f83f..42ffd0b4 100644
--- a/POOLS.md
+++ b/POOLS.md
@@ -102,3 +102,12 @@ Small Time Miners are running various stratum only pools for different coins.
 | Pool URL | Coin | Avg. Hashrate | Avg. Active Workers | Notes |
 | -------- | ---- | ------------: | ------------------: | ----- |
 | https://ltc.hashfaster.com | LTC | 70 MHash | 80 | Custom Template |
+
+### nutnut
+
+
+| Pool URL | Coin | Avg. Hashrate | Avg. Active Workers | Notes |
+| -------- | ---- | ------------: | ------------------: | ----- |
+| http://ftc.nut2pools.com | Feathercoin | 45-50Mhs | 25 workers | New style, PPLNS |
+| http://wdc.nut2pools.com | Worldcoin | 3.5 Mhs | 3 workers | New style, PPLNS |
+| http://pxc.nut2pools.com | Phenixcoin | 0 | 0 | New style | PPLNS |

From e5cb4d0886cb2e533c2736ff3d3570a8033156e0 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Wed, 14 Aug 2013 11:23:14 +0200
Subject: [PATCH 26/39] Fixing combined hashrate graph

This shouuld fix #598 with graphs being completely off
---
 public/templates/mmcFE/statistics/graphs/both.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/mmcFE/statistics/graphs/both.tpl b/public/templates/mmcFE/statistics/graphs/both.tpl
index 03832b5f..878a5b4d 100644
--- a/public/templates/mmcFE/statistics/graphs/both.tpl
+++ b/public/templates/mmcFE/statistics/graphs/both.tpl
@@ -29,7 +29,7 @@
         <td>{$POOLHASHRATES.$i|default:"0"}</td>
 {/for}
 {for $i=0 to date('G', time() - 60 * 60)}
-        <td>{$POOLHASHRATES.$i - $YOURHASHRATES.$i|default:"0"}</td>
+        <td>{$POOLHASHRATES.$i|default:"0"}</td>
 {/for}
       </tr>
     </tbody>

From fcf5a21ce35ff48fed6372add7dbd601b03ee907 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Wed, 14 Aug 2013 11:44:29 +0200
Subject: [PATCH 27/39] Adding QRCodes under Accounts

* Added: API String QR Code for #582 and #591

This will allow more QRCodes being added that are specific to an
account. The require library is added and the API string can be used as
an example how codes are generated.

Fixes #582
---
 public/include/pages/account/qrcode.inc.php   |  6 ++++
 .../site_assets/mmcFE/js/jquery.qrcode.min.js | 28 +++++++++++++++++++
 .../mmcFE/account/qrcode/default.tpl          | 22 +++++++++++++++
 public/templates/mmcFE/global/navigation.tpl  |  1 +
 4 files changed, 57 insertions(+)
 create mode 100644 public/include/pages/account/qrcode.inc.php
 create mode 100644 public/site_assets/mmcFE/js/jquery.qrcode.min.js
 create mode 100644 public/templates/mmcFE/account/qrcode/default.tpl

diff --git a/public/include/pages/account/qrcode.inc.php b/public/include/pages/account/qrcode.inc.php
new file mode 100644
index 00000000..a6543dc5
--- /dev/null
+++ b/public/include/pages/account/qrcode.inc.php
@@ -0,0 +1,6 @@
+<?php
+// Make sure we are called from index.php
+if (!defined('SECURITY')) die('Hacking attempt');
+
+if ($user->isAuthenticated()) $smarty->assign("CONTENT", "default.tpl");
+?>
diff --git a/public/site_assets/mmcFE/js/jquery.qrcode.min.js b/public/site_assets/mmcFE/js/jquery.qrcode.min.js
new file mode 100644
index 00000000..fe9680e6
--- /dev/null
+++ b/public/site_assets/mmcFE/js/jquery.qrcode.min.js
@@ -0,0 +1,28 @@
+(function(r){r.fn.qrcode=function(h){var s;function u(a){this.mode=s;this.data=a}function o(a,c){this.typeNumber=a;this.errorCorrectLevel=c;this.modules=null;this.moduleCount=0;this.dataCache=null;this.dataList=[]}function q(a,c){if(void 0==a.length)throw Error(a.length+"/"+c);for(var d=0;d<a.length&&0==a[d];)d++;this.num=Array(a.length-d+c);for(var b=0;b<a.length-d;b++)this.num[b]=a[b+d]}function p(a,c){this.totalCount=a;this.dataCount=c}function t(){this.buffer=[];this.length=0}u.prototype={getLength:function(){return this.data.length},
+write:function(a){for(var c=0;c<this.data.length;c++)a.put(this.data.charCodeAt(c),8)}};o.prototype={addData:function(a){this.dataList.push(new u(a));this.dataCache=null},isDark:function(a,c){if(0>a||this.moduleCount<=a||0>c||this.moduleCount<=c)throw Error(a+","+c);return this.modules[a][c]},getModuleCount:function(){return this.moduleCount},make:function(){if(1>this.typeNumber){for(var a=1,a=1;40>a;a++){for(var c=p.getRSBlocks(a,this.errorCorrectLevel),d=new t,b=0,e=0;e<c.length;e++)b+=c[e].dataCount;
+for(e=0;e<this.dataList.length;e++)c=this.dataList[e],d.put(c.mode,4),d.put(c.getLength(),j.getLengthInBits(c.mode,a)),c.write(d);if(d.getLengthInBits()<=8*b)break}this.typeNumber=a}this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17;this.modules=Array(this.moduleCount);for(var d=0;d<this.moduleCount;d++){this.modules[d]=Array(this.moduleCount);for(var b=0;b<this.moduleCount;b++)this.modules[d][b]=null}this.setupPositionProbePattern(0,0);this.setupPositionProbePattern(this.moduleCount-
+7,0);this.setupPositionProbePattern(0,this.moduleCount-7);this.setupPositionAdjustPattern();this.setupTimingPattern();this.setupTypeInfo(a,c);7<=this.typeNumber&&this.setupTypeNumber(a);null==this.dataCache&&(this.dataCache=o.createData(this.typeNumber,this.errorCorrectLevel,this.dataList));this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,c){for(var d=-1;7>=d;d++)if(!(-1>=a+d||this.moduleCount<=a+d))for(var b=-1;7>=b;b++)-1>=c+b||this.moduleCount<=c+b||(this.modules[a+d][c+b]=
+0<=d&&6>=d&&(0==b||6==b)||0<=b&&6>=b&&(0==d||6==d)||2<=d&&4>=d&&2<=b&&4>=b?!0:!1)},getBestMaskPattern:function(){for(var a=0,c=0,d=0;8>d;d++){this.makeImpl(!0,d);var b=j.getLostPoint(this);if(0==d||a>b)a=b,c=d}return c},createMovieClip:function(a,c,d){a=a.createEmptyMovieClip(c,d);this.make();for(c=0;c<this.modules.length;c++)for(var d=1*c,b=0;b<this.modules[c].length;b++){var e=1*b;this.modules[c][b]&&(a.beginFill(0,100),a.moveTo(e,d),a.lineTo(e+1,d),a.lineTo(e+1,d+1),a.lineTo(e,d+1),a.endFill())}return a},
+setupTimingPattern:function(){for(var a=8;a<this.moduleCount-8;a++)null==this.modules[a][6]&&(this.modules[a][6]=0==a%2);for(a=8;a<this.moduleCount-8;a++)null==this.modules[6][a]&&(this.modules[6][a]=0==a%2)},setupPositionAdjustPattern:function(){for(var a=j.getPatternPosition(this.typeNumber),c=0;c<a.length;c++)for(var d=0;d<a.length;d++){var b=a[c],e=a[d];if(null==this.modules[b][e])for(var f=-2;2>=f;f++)for(var i=-2;2>=i;i++)this.modules[b+f][e+i]=-2==f||2==f||-2==i||2==i||0==f&&0==i?!0:!1}},setupTypeNumber:function(a){for(var c=
+j.getBCHTypeNumber(this.typeNumber),d=0;18>d;d++){var b=!a&&1==(c>>d&1);this.modules[Math.floor(d/3)][d%3+this.moduleCount-8-3]=b}for(d=0;18>d;d++)b=!a&&1==(c>>d&1),this.modules[d%3+this.moduleCount-8-3][Math.floor(d/3)]=b},setupTypeInfo:function(a,c){for(var d=j.getBCHTypeInfo(this.errorCorrectLevel<<3|c),b=0;15>b;b++){var e=!a&&1==(d>>b&1);6>b?this.modules[b][8]=e:8>b?this.modules[b+1][8]=e:this.modules[this.moduleCount-15+b][8]=e}for(b=0;15>b;b++)e=!a&&1==(d>>b&1),8>b?this.modules[8][this.moduleCount-
+b-1]=e:9>b?this.modules[8][15-b-1+1]=e:this.modules[8][15-b-1]=e;this.modules[this.moduleCount-8][8]=!a},mapData:function(a,c){for(var d=-1,b=this.moduleCount-1,e=7,f=0,i=this.moduleCount-1;0<i;i-=2)for(6==i&&i--;;){for(var g=0;2>g;g++)if(null==this.modules[b][i-g]){var n=!1;f<a.length&&(n=1==(a[f]>>>e&1));j.getMask(c,b,i-g)&&(n=!n);this.modules[b][i-g]=n;e--; -1==e&&(f++,e=7)}b+=d;if(0>b||this.moduleCount<=b){b-=d;d=-d;break}}}};o.PAD0=236;o.PAD1=17;o.createData=function(a,c,d){for(var c=p.getRSBlocks(a,
+c),b=new t,e=0;e<d.length;e++){var f=d[e];b.put(f.mode,4);b.put(f.getLength(),j.getLengthInBits(f.mode,a));f.write(b)}for(e=a=0;e<c.length;e++)a+=c[e].dataCount;if(b.getLengthInBits()>8*a)throw Error("code length overflow. ("+b.getLengthInBits()+">"+8*a+")");for(b.getLengthInBits()+4<=8*a&&b.put(0,4);0!=b.getLengthInBits()%8;)b.putBit(!1);for(;!(b.getLengthInBits()>=8*a);){b.put(o.PAD0,8);if(b.getLengthInBits()>=8*a)break;b.put(o.PAD1,8)}return o.createBytes(b,c)};o.createBytes=function(a,c){for(var d=
+0,b=0,e=0,f=Array(c.length),i=Array(c.length),g=0;g<c.length;g++){var n=c[g].dataCount,h=c[g].totalCount-n,b=Math.max(b,n),e=Math.max(e,h);f[g]=Array(n);for(var k=0;k<f[g].length;k++)f[g][k]=255&a.buffer[k+d];d+=n;k=j.getErrorCorrectPolynomial(h);n=(new q(f[g],k.getLength()-1)).mod(k);i[g]=Array(k.getLength()-1);for(k=0;k<i[g].length;k++)h=k+n.getLength()-i[g].length,i[g][k]=0<=h?n.get(h):0}for(k=g=0;k<c.length;k++)g+=c[k].totalCount;d=Array(g);for(k=n=0;k<b;k++)for(g=0;g<c.length;g++)k<f[g].length&&
+(d[n++]=f[g][k]);for(k=0;k<e;k++)for(g=0;g<c.length;g++)k<i[g].length&&(d[n++]=i[g][k]);return d};s=4;for(var j={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,
+78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(a){for(var c=a<<10;0<=j.getBCHDigit(c)-j.getBCHDigit(j.G15);)c^=j.G15<<j.getBCHDigit(c)-j.getBCHDigit(j.G15);return(a<<10|c)^j.G15_MASK},getBCHTypeNumber:function(a){for(var c=a<<12;0<=j.getBCHDigit(c)-
+j.getBCHDigit(j.G18);)c^=j.G18<<j.getBCHDigit(c)-j.getBCHDigit(j.G18);return a<<12|c},getBCHDigit:function(a){for(var c=0;0!=a;)c++,a>>>=1;return c},getPatternPosition:function(a){return j.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,c,d){switch(a){case 0:return 0==(c+d)%2;case 1:return 0==c%2;case 2:return 0==d%3;case 3:return 0==(c+d)%3;case 4:return 0==(Math.floor(c/2)+Math.floor(d/3))%2;case 5:return 0==c*d%2+c*d%3;case 6:return 0==(c*d%2+c*d%3)%2;case 7:return 0==(c*d%3+(c+d)%2)%2;default:throw Error("bad maskPattern:"+
+a);}},getErrorCorrectPolynomial:function(a){for(var c=new q([1],0),d=0;d<a;d++)c=c.multiply(new q([1,l.gexp(d)],0));return c},getLengthInBits:function(a,c){if(1<=c&&10>c)switch(a){case 1:return 10;case 2:return 9;case s:return 8;case 8:return 8;default:throw Error("mode:"+a);}else if(27>c)switch(a){case 1:return 12;case 2:return 11;case s:return 16;case 8:return 10;default:throw Error("mode:"+a);}else if(41>c)switch(a){case 1:return 14;case 2:return 13;case s:return 16;case 8:return 12;default:throw Error("mode:"+
+a);}else throw Error("type:"+c);},getLostPoint:function(a){for(var c=a.getModuleCount(),d=0,b=0;b<c;b++)for(var e=0;e<c;e++){for(var f=0,i=a.isDark(b,e),g=-1;1>=g;g++)if(!(0>b+g||c<=b+g))for(var h=-1;1>=h;h++)0>e+h||c<=e+h||0==g&&0==h||i==a.isDark(b+g,e+h)&&f++;5<f&&(d+=3+f-5)}for(b=0;b<c-1;b++)for(e=0;e<c-1;e++)if(f=0,a.isDark(b,e)&&f++,a.isDark(b+1,e)&&f++,a.isDark(b,e+1)&&f++,a.isDark(b+1,e+1)&&f++,0==f||4==f)d+=3;for(b=0;b<c;b++)for(e=0;e<c-6;e++)a.isDark(b,e)&&!a.isDark(b,e+1)&&a.isDark(b,e+
+2)&&a.isDark(b,e+3)&&a.isDark(b,e+4)&&!a.isDark(b,e+5)&&a.isDark(b,e+6)&&(d+=40);for(e=0;e<c;e++)for(b=0;b<c-6;b++)a.isDark(b,e)&&!a.isDark(b+1,e)&&a.isDark(b+2,e)&&a.isDark(b+3,e)&&a.isDark(b+4,e)&&!a.isDark(b+5,e)&&a.isDark(b+6,e)&&(d+=40);for(e=f=0;e<c;e++)for(b=0;b<c;b++)a.isDark(b,e)&&f++;a=Math.abs(100*f/c/c-50)/5;return d+10*a}},l={glog:function(a){if(1>a)throw Error("glog("+a+")");return l.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;256<=a;)a-=255;return l.EXP_TABLE[a]},EXP_TABLE:Array(256),
+LOG_TABLE:Array(256)},m=0;8>m;m++)l.EXP_TABLE[m]=1<<m;for(m=8;256>m;m++)l.EXP_TABLE[m]=l.EXP_TABLE[m-4]^l.EXP_TABLE[m-5]^l.EXP_TABLE[m-6]^l.EXP_TABLE[m-8];for(m=0;255>m;m++)l.LOG_TABLE[l.EXP_TABLE[m]]=m;q.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var c=Array(this.getLength()+a.getLength()-1),d=0;d<this.getLength();d++)for(var b=0;b<a.getLength();b++)c[d+b]^=l.gexp(l.glog(this.get(d))+l.glog(a.get(b)));return new q(c,0)},mod:function(a){if(0>
+this.getLength()-a.getLength())return this;for(var c=l.glog(this.get(0))-l.glog(a.get(0)),d=Array(this.getLength()),b=0;b<this.getLength();b++)d[b]=this.get(b);for(b=0;b<a.getLength();b++)d[b]^=l.gexp(l.glog(a.get(b))+c);return(new q(d,0)).mod(a)}};p.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],
+[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,
+116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,
+43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,
+3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,
+55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,
+45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];p.getRSBlocks=function(a,c){var d=p.getRsBlockTable(a,c);if(void 0==d)throw Error("bad rs block @ typeNumber:"+a+"/errorCorrectLevel:"+c);for(var b=d.length/3,e=[],f=0;f<b;f++)for(var h=d[3*f+0],g=d[3*f+1],j=d[3*f+2],l=0;l<h;l++)e.push(new p(g,j));return e};p.getRsBlockTable=function(a,c){switch(c){case 1:return p.RS_BLOCK_TABLE[4*(a-1)+0];case 0:return p.RS_BLOCK_TABLE[4*(a-1)+1];case 3:return p.RS_BLOCK_TABLE[4*
+(a-1)+2];case 2:return p.RS_BLOCK_TABLE[4*(a-1)+3]}};t.prototype={get:function(a){return 1==(this.buffer[Math.floor(a/8)]>>>7-a%8&1)},put:function(a,c){for(var d=0;d<c;d++)this.putBit(1==(a>>>c-d-1&1))},getLengthInBits:function(){return this.length},putBit:function(a){var c=Math.floor(this.length/8);this.buffer.length<=c&&this.buffer.push(0);a&&(this.buffer[c]|=128>>>this.length%8);this.length++}};"string"===typeof h&&(h={text:h});h=r.extend({},{render:"canvas",width:256,height:256,typeNumber:-1,
+correctLevel:2,background:"#ffffff",foreground:"#000000"},h);return this.each(function(){var a;if("canvas"==h.render){a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();var c=document.createElement("canvas");c.width=h.width;c.height=h.height;for(var d=c.getContext("2d"),b=h.width/a.getModuleCount(),e=h.height/a.getModuleCount(),f=0;f<a.getModuleCount();f++)for(var i=0;i<a.getModuleCount();i++){d.fillStyle=a.isDark(f,i)?h.foreground:h.background;var g=Math.ceil((i+1)*b)-Math.floor(i*b),
+j=Math.ceil((f+1)*b)-Math.floor(f*b);d.fillRect(Math.round(i*b),Math.round(f*e),g,j)}}else{a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();c=r("<table></table>").css("width",h.width+"px").css("height",h.height+"px").css("border","0px").css("border-collapse","collapse").css("background-color",h.background);d=h.width/a.getModuleCount();b=h.height/a.getModuleCount();for(e=0;e<a.getModuleCount();e++){f=r("<tr></tr>").css("height",b+"px").appendTo(c);for(i=0;i<a.getModuleCount();i++)r("<td></td>").css("width",
+d+"px").css("background-color",a.isDark(e,i)?h.foreground:h.background).appendTo(f)}}a=c;jQuery(a).appendTo(this)})}})(jQuery);
diff --git a/public/templates/mmcFE/account/qrcode/default.tpl b/public/templates/mmcFE/account/qrcode/default.tpl
new file mode 100644
index 00000000..2656314e
--- /dev/null
+++ b/public/templates/mmcFE/account/qrcode/default.tpl
@@ -0,0 +1,22 @@
+{if !$GLOBAL.config.website.api.disabled}
+{include file="global/block_header.tpl" BLOCK_HEADER="API String"}
+<p>This code will allow you to import the full API string into your mobile application.</p>
+<script type="text/javascript" src="{$PATH}/js/jquery.qrcode.min.js"></script>
+<script type="text/javascript">
+  {literal}
+  //Wrap it within $(document).ready() to invoke the function after DOM loads.
+  $(document).ready(function(){
+    $('#qrcodeholder').qrcode({
+      text    : "{/literal}|http{if $smarty.server.HTTPS eq '1'}s{/if}://{$smarty.server.SERVER_NAME}{$smarty.server.PHP_SELF}?page=api|{$GLOBAL.userdata.api_key}|{$GLOBAL.userdata.id}|{literal}",
+      render    : "canvas",  // 'canvas' or 'table'. Default value is 'canvas'
+      background : "#ffffff",
+      foreground : "#000000",
+      width : 250,
+      height: 250 
+    });
+  });
+  {/literal}
+</script>
+<div id="qrcodeholder"></div>
+{include file="global/block_footer.tpl"}
+{/if}
diff --git a/public/templates/mmcFE/global/navigation.tpl b/public/templates/mmcFE/global/navigation.tpl
index a18b6a94..4480cf2b 100644
--- a/public/templates/mmcFE/global/navigation.tpl
+++ b/public/templates/mmcFE/global/navigation.tpl
@@ -8,6 +8,7 @@
                 <li><a href="{$smarty.server.PHP_SELF}?page=account&action=transactions">Transactions</a></li>
                 {if !$GLOBAL.config.disable_notifications}<li><a href="{$smarty.server.PHP_SELF}?page=account&action=notifications">Notifications</a></li>{/if}
                 {if !$GLOBAL.config.disable_invitations}<li><a href="{$smarty.server.PHP_SELF}?page=account&action=invitations">Invitations</a></li>{/if}
+                <li><a href="{$smarty.server.PHP_SELF}?page=account&action=qrcode">QR Codes</a></li>
               </ul>
             </li>
             {/if}

From ad6ceed77ec6169e6d42cb76c0ea7dd9a594a458 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Wed, 14 Aug 2013 11:47:46 +0200
Subject: [PATCH 28/39] fixing worker activity on mobile template

---
 public/templates/mobile/account/workers/default.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/mobile/account/workers/default.tpl b/public/templates/mobile/account/workers/default.tpl
index 0e171ba6..09ebf867 100644
--- a/public/templates/mobile/account/workers/default.tpl
+++ b/public/templates/mobile/account/workers/default.tpl
@@ -9,7 +9,7 @@
       {assign var="username" value="."|escape|explode:$WORKERS[worker].username:2} 
       <tr>
         <td align="left"{if $WORKERS[worker].active} style="color: orange"{/if}>{$username.0|escape}.{$username.1|escape}</td>
-        <td align="center"><img src="{$PATH}/images/{if $WORKERS[worker].active}success{else}error{/if}.gif" /></td>
+        <td align="center"><img src="{$PATH}/images/{if $WORKERS[worker].hashrate > 0}success{else}error{/if}.gif" /></td>
         <td align="right">{$WORKERS[worker].hashrate|number_format}</td>
       </tr>
       {/section}

From 020d1ef01b13afa0418f82c6e1c299788c632ff5 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Wed, 14 Aug 2013 11:48:41 +0200
Subject: [PATCH 29/39] Fixing notification reset for active workers

Fixes #600
---
 cronjobs/notifications.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cronjobs/notifications.php b/cronjobs/notifications.php
index c3f2f29c..4a8931d6 100755
--- a/cronjobs/notifications.php
+++ b/cronjobs/notifications.php
@@ -58,7 +58,7 @@ if (!empty($aNotifications)) {
     $aData = json_decode($aNotification['data'], true);
     $aWorker = $worker->getWorker($aData['id']);
     $log->logInfo("    " . $aWorker['username'] . " ...");
-    if ($aWorker['active'] == 1) {
+    if ($aWorker['hashrate'] > 0) {
       if ($notification->setInactive($aNotification['id'])) {
         $log->logInfo(" updated #" . $aNotification['id'] . " for " . $aWorker['username'] . " as inactive\n");
       } else {

From 16557465e43e7a18a9917592de2f9e70ced96b54 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Thu, 15 Aug 2013 08:58:50 +0200
Subject: [PATCH 30/39] Added: getuserbalance API call

* Adds getbalance to API
* Admins: Can fetch any users balance
* Users: Can fetch only their own balance

Fixes #605
---
 .../include/pages/api/getuserbalance.inc.php  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 public/include/pages/api/getuserbalance.inc.php

diff --git a/public/include/pages/api/getuserbalance.inc.php b/public/include/pages/api/getuserbalance.inc.php
new file mode 100644
index 00000000..9b765ce7
--- /dev/null
+++ b/public/include/pages/api/getuserbalance.inc.php
@@ -0,0 +1,28 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY')) die('Hacking attempt');
+
+// Check if the API is activated
+$api->isActive();
+
+// Check user token
+$user_id = $user->checkApiKey($_REQUEST['api_key']);
+
+// We have to check if that user is admin too
+if ( ! $user->isAdmin($user_id) && ($_REQUEST['id'] != $user_id && !empty($_REQUEST['id']))) {
+  header("HTTP/1.1 401 Unauthorized");
+  die("Access denied");
+} else if ($user->isAdmin($user_id)) {
+  $id = $_REQUEST['id'];
+  ctype_digit($_REQUEST['id']) ? $id = $_REQUEST['id'] : $id = $user->getUserId($_REQUEST['id']);
+} else {
+  $id = $user_id;
+}
+
+// Output JSON format
+echo json_encode(array('getuserbalance' => $transaction->getBalance($id)));
+
+// Supress master template
+$supress_master = 1;
+?>

From 50f380c25e2716668f7b8a90aa8ca7371e617996 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Thu, 15 Aug 2013 09:14:02 +0200
Subject: [PATCH 31/39] first test to fill with data

---
 public/include/classes/statistics.class.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/public/include/classes/statistics.class.php b/public/include/classes/statistics.class.php
index 1452db89..70a2e986 100644
--- a/public/include/classes/statistics.class.php
+++ b/public/include/classes/statistics.class.php
@@ -406,6 +406,17 @@ class Statistics {
       while ($row = $result->fetch_assoc()) {
         $aData[$row['hour']] = $row['hashrate'];
       }
+      // We have no data, so we fill with 0
+      if (empty($aData)) {
+        for ($i = 0; $i <= 24; $i++) $aData[$i] = 0;
+      } else {
+        $count = -1;
+        foreach ($aData as $hour => $hashrate) {
+          $count++;
+          if ($count == $hour) continue;
+          $aData[$count] = 0;
+        }
+      }
       return $this->memcache->setCache(__FUNCTION__ . $account_id, $aData);
     }
     // Catchall

From 14c0535b106a8b13bcd5bcd807a5dab0efd8f6a0 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Thu, 15 Aug 2013 09:58:33 +0200
Subject: [PATCH 32/39] Fill empty hours with proper data

* Properly sort the array prior to sending it back
 * Sort from current to one hour earlier for proper data display
 * Adjusted templates to use new sorted arrays

Fixes #606
---
 public/include/classes/statistics.class.php   | 30 +++++++------------
 .../mmcFE/statistics/graphs/both.tpl          | 27 ++++++-----------
 .../mmcFE/statistics/graphs/mine.tpl          | 18 ++++-------
 .../mmcFE/statistics/graphs/pool.tpl          | 18 ++++-------
 4 files changed, 32 insertions(+), 61 deletions(-)

diff --git a/public/include/classes/statistics.class.php b/public/include/classes/statistics.class.php
index 70a2e986..d61222b0 100644
--- a/public/include/classes/statistics.class.php
+++ b/public/include/classes/statistics.class.php
@@ -402,21 +402,11 @@ class Statistics {
         AND a.id = ?
       GROUP BY HOUR(time)");
     if ($this->checkStmt($stmt) && $stmt->bind_param('ii', $account_id, $account_id) && $stmt->execute() && $result = $stmt->get_result()) {
-      $aData = array();
-      while ($row = $result->fetch_assoc()) {
-        $aData[$row['hour']] = $row['hashrate'];
-      }
-      // We have no data, so we fill with 0
-      if (empty($aData)) {
-        for ($i = 0; $i <= 24; $i++) $aData[$i] = 0;
-      } else {
-        $count = -1;
-        foreach ($aData as $hour => $hashrate) {
-          $count++;
-          if ($count == $hour) continue;
-          $aData[$count] = 0;
-        }
-      }
+      $iStartHour = date('G');
+      for ($i = $iStartHour; $i <= 24; $i++) $aData[$i] = 0;
+      while ($row = $result->fetch_assoc()) $aData[$row['hour']] = $row['hashrate'];
+      // Fill any non-existing hours with 0 hashrate
+      for ($i = 0; $i <= 24; $i++) if (!array_key_exists($i, $aData)) $aData[$i] = 0;
       return $this->memcache->setCache(__FUNCTION__ . $account_id, $aData);
     }
     // Catchall
@@ -449,10 +439,12 @@ class Statistics {
         AND time > NOW() - INTERVAL 25 HOUR
       GROUP BY HOUR(time)");
     if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result()) {
-      while ($row = $result->fetch_assoc()) {
-        $aData[$row['hour']] = $row['hashrate'];
-      }
-      return $this->memcache->setCache(__FUNCTION__, @$aData);
+      $iStartHour = date('G');
+      for ($i = $iStartHour; $i <= 24; $i++) $aData[$i] = 0;
+      while ($row = $result->fetch_assoc()) $aData[$row['hour']] = (int) $row['hashrate'];
+      // Fill any non-existing hours with 0 hashrate
+      for ($i = 0; $i <= 24; $i++) if (!array_key_exists($i, $aData)) $aData[$i] = 0;
+      return $this->memcache->setCache(__FUNCTION__, $aData);
     }
     // Catchall
     $this->debug->append("Failed to fetch hourly hashrate: " . $this->mysqli->error);
diff --git a/public/templates/mmcFE/statistics/graphs/both.tpl b/public/templates/mmcFE/statistics/graphs/both.tpl
index 878a5b4d..a8011e90 100644
--- a/public/templates/mmcFE/statistics/graphs/both.tpl
+++ b/public/templates/mmcFE/statistics/graphs/both.tpl
@@ -5,32 +5,23 @@
     <thead>
       <tr>
         <td></td>
-{for $i=date('G') to 23}
-        <th scope="col">{$i}:00</th>
-{/for}
-{for $i=0 to date('G', time () - 60 * 60)}
-        <th scope="col">{$i}:00</th>
-{/for}
+{foreach $YOURHASHRATES as $hour=>$hashrate}
+        <th scope="col">{$hour|default:"0"}:00</th>
+{/foreach}
       </tr>
     </thead>
     <tbody>
       <tr>
         <th scope="row">{$smarty.session.USERDATA.username}</th>
-{for $i=date('G') to 23}
-        <td>{$YOURHASHRATES.$i|default:"0"}</td>
-{/for}
-{for $i=0 to date('G', time() - 60 * 60)}
-        <td>{$YOURHASHRATES.$i|default:"0"}</td>
-{/for}
+{foreach $YOURHASHRATES as $hour=>$hashrate}
+        <td>{$hashrate|default:"0"}</td>
+{/foreach}
       </tr>
       <tr>
         <th scope="row">Pool</th>
-{for $i=date('G') to 23}
-        <td>{$POOLHASHRATES.$i|default:"0"}</td>
-{/for}
-{for $i=0 to date('G', time() - 60 * 60)}
-        <td>{$POOLHASHRATES.$i|default:"0"}</td>
-{/for}
+{foreach $POOLHASHRATES as $hour=>$hashrate}
+        <td>{$hashrate|default:"0"}</td>
+{/foreach}
       </tr>
     </tbody>
   </table>
diff --git a/public/templates/mmcFE/statistics/graphs/mine.tpl b/public/templates/mmcFE/statistics/graphs/mine.tpl
index 4d4259f2..05c8e2b1 100644
--- a/public/templates/mmcFE/statistics/graphs/mine.tpl
+++ b/public/templates/mmcFE/statistics/graphs/mine.tpl
@@ -5,23 +5,17 @@
     <thead>
       <tr>
         <td></td>
-{for $i=date('G') to 23}
-        <th scope="col">{$i}:00</th>
-{/for}
-{for $i=0 to date('G', time () - 60 * 60)}
-        <th scope="col">{$i}:00</th>
-{/for}
+{foreach $YOURHASHRATES as $hour=>$hashrate}
+        <th scope="col">{$hour|default:"0"}:00</th>
+{/foreach}
       </tr>
     </thead>
     <tbody>
       <tr>
         <th scope="row">{$smarty.session.USERDATA.username}</th>
-{for $i=date('G') to 23}
-        <td>{$YOURHASHRATES.$i|default:"0"}</td>
-{/for}
-{for $i=0 to date('G', time() - 60 * 60)}
-        <td>{$YOURHASHRATES.$i|default:"0"}</td>
-{/for}
+{foreach $YOURHASHRATES as $hour=>$hashrate}
+        <td>{$hashrate|default:"0"}</td>
+{/foreach}
       </tr>
     </tbody>
   </table>
diff --git a/public/templates/mmcFE/statistics/graphs/pool.tpl b/public/templates/mmcFE/statistics/graphs/pool.tpl
index f8d118c7..704dd2bf 100644
--- a/public/templates/mmcFE/statistics/graphs/pool.tpl
+++ b/public/templates/mmcFE/statistics/graphs/pool.tpl
@@ -5,23 +5,17 @@
     <thead>
       <tr>
         <td></td>
-{for $i=date('G') to 23}
-        <th scope="col">{$i}:00</th>
-{/for}
-{for $i=0 to date('G', time () - 60 * 60)}
-        <th scope="col">{$i}:00</th>
-{/for}
+{foreach $POOLHASHRATES as $hour=>$hashrate}
+        <th scope="col">{$hour|default:"0"}:00</th>
+{/foreach}
       </tr>
     </thead>
     <tbody>
       <tr>
         <th scope="row">Pool</th>
-{for $i=date('G') to 23}
-        <td>{$POOLHASHRATES.$i|default:"0"}</td>
-{/for}
-{for $i=0 to date('G', time() - 60 * 60)}
-        <td>{$POOLHASHRATES.$i|default:"0"}</td>
-{/for}
+{foreach $POOLHASHRATES as $hour=>$hashrate}
+        <td>{$hashrate|default:"0"}</td>
+{/foreach}
       </tr>
     </tbody>
   </table>

From 1708e5d2b5d5077fb6c06b531a78c4946dfa3321 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 15 Aug 2013 10:03:22 +0200
Subject: [PATCH 33/39] Do not add 24th hour, use 0 hour

---
 public/include/classes/statistics.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/include/classes/statistics.class.php b/public/include/classes/statistics.class.php
index d61222b0..e4e06167 100644
--- a/public/include/classes/statistics.class.php
+++ b/public/include/classes/statistics.class.php
@@ -403,10 +403,10 @@ class Statistics {
       GROUP BY HOUR(time)");
     if ($this->checkStmt($stmt) && $stmt->bind_param('ii', $account_id, $account_id) && $stmt->execute() && $result = $stmt->get_result()) {
       $iStartHour = date('G');
-      for ($i = $iStartHour; $i <= 24; $i++) $aData[$i] = 0;
+      for ($i = $iStartHour; $i < 24; $i++) $aData[$i] = 0;
       while ($row = $result->fetch_assoc()) $aData[$row['hour']] = $row['hashrate'];
       // Fill any non-existing hours with 0 hashrate
-      for ($i = 0; $i <= 24; $i++) if (!array_key_exists($i, $aData)) $aData[$i] = 0;
+      for ($i = 0; $i < 24; $i++) if (!array_key_exists($i, $aData)) $aData[$i] = 0;
       return $this->memcache->setCache(__FUNCTION__ . $account_id, $aData);
     }
     // Catchall
@@ -440,10 +440,10 @@ class Statistics {
       GROUP BY HOUR(time)");
     if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result()) {
       $iStartHour = date('G');
-      for ($i = $iStartHour; $i <= 24; $i++) $aData[$i] = 0;
+      for ($i = $iStartHour; $i < 24; $i++) $aData[$i] = 0;
       while ($row = $result->fetch_assoc()) $aData[$row['hour']] = (int) $row['hashrate'];
       // Fill any non-existing hours with 0 hashrate
-      for ($i = 0; $i <= 24; $i++) if (!array_key_exists($i, $aData)) $aData[$i] = 0;
+      for ($i = 0; $i < 24; $i++) if (!array_key_exists($i, $aData)) $aData[$i] = 0;
       return $this->memcache->setCache(__FUNCTION__, $aData);
     }
     // Catchall

From a56907ba00543c7c45a5b0e06bb4368c7d5f997d Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Thu, 15 Aug 2013 10:08:48 +0200
Subject: [PATCH 34/39] Adding gethourlyhashrates API call

Fixes #608
---
 .../pages/api/gethourlyhashrates.inc.php      | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 public/include/pages/api/gethourlyhashrates.inc.php

diff --git a/public/include/pages/api/gethourlyhashrates.inc.php b/public/include/pages/api/gethourlyhashrates.inc.php
new file mode 100644
index 00000000..776df473
--- /dev/null
+++ b/public/include/pages/api/gethourlyhashrates.inc.php
@@ -0,0 +1,32 @@
+<?php
+
+// Make sure we are called from index.php
+if (!defined('SECURITY')) die('Hacking attempt');
+
+// Check if the API is activated
+$api->isActive();
+
+// Check user token
+$user_id = $user->checkApiKey($_REQUEST['api_key']);
+
+if ( ! $user->isAdmin($user_id) && ($_REQUEST['id'] != $user_id && !empty($_REQUEST['id']))) {
+  // User is admin and tries to access an ID that is not their own
+  header("HTTP/1.1 401 Unauthorized");
+  die("Access denied");
+} else if ($user->isAdmin($user_id)) {
+  // Is it a username or a user ID
+  ctype_digit($_REQUEST['id']) ? $id = $_REQUEST['id'] : $id = $user->getUserId($_REQUEST['id']);
+} else {
+  // Not admin, only allow own user ID
+  $id = $user_id;
+}
+
+// Output JSON format
+echo json_encode(array('gethourlyhashrates' => array(
+  'mine' => $statistics->getHourlyHashrateByAccount($id),
+  'pool' => $statistics->getHourlyHashrateByPool()
+)), JSON_FORCE_OBJECT);
+
+// Supress master template
+$supress_master = 1;
+?>

From e7b8cb8d4a14c3f9573e7f3ffb05259c5fc8e958 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Mon, 19 Aug 2013 08:48:27 +0200
Subject: [PATCH 35/39] Remove number_format for transaction generation

* Fixes: Incorrect payouts due to number formatting
* Moved number_format to output only

Fixes #611
---
 cronjobs/pps_payout.php          | 20 ++++++++++----------
 cronjobs/proportional_payout.php | 16 ++++++++--------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/cronjobs/pps_payout.php b/cronjobs/pps_payout.php
index fc66ecff..a02b8fd2 100755
--- a/cronjobs/pps_payout.php
+++ b/cronjobs/pps_payout.php
@@ -44,13 +44,13 @@ if ( $bitcoin->can_connect() === true ){
 
 // Value per share calculation
 if ($config['reward_type'] != 'block') {
-  $pps_value = number_format(round($config['reward'] / (pow(2,32) * $dDifficulty) * pow(2, $config['difficulty']), 12) ,12);
+  $pps_value = round($config['reward'] / (pow(2,32) * $dDifficulty) * pow(2, $config['difficulty']), 12);
 } else {
   // Try to find the last block value and use that for future payouts, revert to fixed reward if none found
   if ($aLastBlock = $block->getLast()) {
-    $pps_value = number_format(round($aLastBlock['amount'] / (pow(2,32) * $dDifficulty) * pow(2, $config['difficulty']), 12) ,12);
+    $pps_value = round($aLastBlock['amount'] / (pow(2,32) * $dDifficulty) * pow(2, $config['difficulty']), 12);
   } else {
-    $pps_value = number_format(round($config['reward'] / (pow(2,32) * $dDifficulty) * pow(2, $config['difficulty']), 12) ,12);
+    $pps_value = round($config['reward'] / (pow(2,32) * $dDifficulty) * pow(2, $config['difficulty']), 12);
   }
 }
 
@@ -65,7 +65,7 @@ $log->logInfo("ID\tUsername\tInvalid\tValid\t\tPPS Value\t\tPayout\t\tDonation\t
 
 foreach ($aAccountShares as $aData) {
   // Take our valid shares and multiply by per share value
-  $aData['payout'] = number_format(round($aData['valid'] * $pps_value, 8), 8);
+  $aData['payout'] = round($aData['valid'] * $pps_value, 8);
 
   // Defaults
   $aData['fee' ] = 0;
@@ -73,18 +73,18 @@ foreach ($aAccountShares as $aData) {
 
   // Calculate block fees
   if ($config['fees'] > 0 && $aData['no_fees'] == 0)
-    $aData['fee'] = number_format(round($config['fees'] / 100 * $aData['payout'], 8), 8); 
+    $aData['fee'] = round($config['fees'] / 100 * $aData['payout'], 8);
   // Calculate donation amount
-  $aData['donation'] = number_format(round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 8), 8); 
+  $aData['donation'] = round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 8);
 
   $log->logInfo($aData['id'] . "\t" .
     $aData['username'] . "\t" .
     $aData['invalid'] . "\t" .
     $aData['valid'] . "\t*\t" .
-    $pps_value . "\t=\t" .
-    $aData['payout'] . "\t" .
-    $aData['donation'] . "\t" .
-    $aData['fee']);
+    number_format($pps_value, 12) . "\t=\t" .
+    number_format($aData['payout'], 8) . "\t" .
+    number_format($aData['donation'], 8) . "\t" .
+    number_format($aData['fee']), 8);
 
   // Add new credit transaction
   if (!$transaction->addTransaction($aData['id'], $aData['payout'], 'Credit_PPS'))
diff --git a/cronjobs/proportional_payout.php b/cronjobs/proportional_payout.php
index 47e55dc3..a591da22 100755
--- a/cronjobs/proportional_payout.php
+++ b/cronjobs/proportional_payout.php
@@ -60,26 +60,26 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
     // Loop through all accounts that have found shares for this round
     foreach ($aAccountShares as $key => $aData) {
       // Payout based on shares, PPS system
-      $aData['percentage'] = number_format(round(( 100 / $iRoundShares ) * $aData['valid'], 8), 8);
-      $aData['payout'] = number_format(round(( $aData['percentage'] / 100 ) * $dReward, 8), 8);
+      $aData['percentage'] = round(( 100 / $iRoundShares ) * $aData['valid'], 8);
+      $aData['payout'] = round(( $aData['percentage'] / 100 ) * $dReward, 8);
       // Defaults
       $aData['fee' ] = 0;
       $aData['donation'] = 0;
 
       if ($config['fees'] > 0 && $aData['no_fees'] == 0)
-        $aData['fee'] = number_format(round($config['fees'] / 100 * $aData['payout'], 8), 8);
+        $aData['fee'] = round($config['fees'] / 100 * $aData['payout'], 8);
       // Calculate donation amount, fees not included
-      $aData['donation'] = number_format(round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 8), 8);
+      $aData['donation'] = round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 8);
 
       // Verbose output of this users calculations
       $log->logInfo($aData['id'] . "\t" .
         $aData['username'] . "\t" .
         $aData['valid'] . "\t" .
         $aData['invalid'] . "\t" .
-        $aData['percentage'] . "\t" .
-        $aData['payout'] . "\t" .
-        $aData['donation'] . "\t" .
-        $aData['fee']);
+        number_format($aData['percentage'], 8) . "\t" .
+        number_format($aData['payout'], 8) . "\t" .
+        number_format($aData['donation'], 8) . "\t" .
+        number_format($aData['fee']), 8);
 
       // Update user share statistics
       if (!$statistics->updateShareStatistics($aData, $aBlock['id']))

From f0921264f8047b54df6ad50585c73381db49185f Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Mon, 19 Aug 2013 09:36:25 +0200
Subject: [PATCH 36/39] Fixing proof-of-stake detection

Fixes #569
---
 cronjobs/findblock.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cronjobs/findblock.php b/cronjobs/findblock.php
index d5215f87..eb19bd41 100755
--- a/cronjobs/findblock.php
+++ b/cronjobs/findblock.php
@@ -59,7 +59,7 @@ if (empty($aTransactions['transactions'])) {
         $aData['difficulty'] . "\t" .
         strftime("%Y-%m-%d %H:%M:%S", $aData['time']));
       if ( ! empty($aBlockInfo['flags']) && preg_match('/proof-of-stake/', $aBlockInfo['flags']) ) {
-        $logs->logInfo("Block above with height " .  $aData['height'] . " not added to database, proof-of-stake block!");
+        $log->logInfo("Block above with height " .  $aData['height'] . " not added to database, proof-of-stake block!");
         continue;
       }
       if (!$block->addBlock($aData) ) {

From f8f50fdc054b0e5329f596ff218dbd29e996dbd9 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Mon, 19 Aug 2013 09:39:45 +0200
Subject: [PATCH 37/39] Removing IRC reference

Fixes #612
---
 public/templates/mmcFE/support/default.tpl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/templates/mmcFE/support/default.tpl b/public/templates/mmcFE/support/default.tpl
index 4a3e6eb4..f78550fe 100644
--- a/public/templates/mmcFE/support/default.tpl
+++ b/public/templates/mmcFE/support/default.tpl
@@ -7,9 +7,7 @@
 
   <div class="block_content" style="padding:10px;">
     <p>This product comes 'as-is' without any warranty. Please check the Apache License, Version 2.0, for details.</p>
-    <p>If you would like to get in touch you can find me on Freenode IRC @ #mmcfe-ng.</p>
-
-  </div>          <!-- nested block ends -->
+  </div>
   <div class="bendl"></div>
   <div class="bendr"></div>
 </div>

From 59bd71c75d49b5d29592faf67240f0607de156cb Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Mon, 19 Aug 2013 09:59:41 +0200
Subject: [PATCH 38/39] Fixing admin requests

Fixes #605
---
 public/include/pages/api/getuserbalance.inc.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/include/pages/api/getuserbalance.inc.php b/public/include/pages/api/getuserbalance.inc.php
index 9b765ce7..76462c00 100644
--- a/public/include/pages/api/getuserbalance.inc.php
+++ b/public/include/pages/api/getuserbalance.inc.php
@@ -9,11 +9,13 @@ $api->isActive();
 // Check user token
 $user_id = $user->checkApiKey($_REQUEST['api_key']);
 
+echo $user_id;
+
 // We have to check if that user is admin too
 if ( ! $user->isAdmin($user_id) && ($_REQUEST['id'] != $user_id && !empty($_REQUEST['id']))) {
   header("HTTP/1.1 401 Unauthorized");
   die("Access denied");
-} else if ($user->isAdmin($user_id)) {
+} else if ($user->isAdmin($user_id) && !empty($_REQUEST['id'])) {
   $id = $_REQUEST['id'];
   ctype_digit($_REQUEST['id']) ? $id = $_REQUEST['id'] : $id = $user->getUserId($_REQUEST['id']);
 } else {

From 2db6dba4826edad7a4eda70de6663345a4ad2016 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebgrewe@bigpoint.net>
Date: Mon, 19 Aug 2013 10:40:25 +0200
Subject: [PATCH 39/39] Fix: Display proper PPS value

* Fixes: Wrong PPS value before the first block is found

Fixes #617
---
 public/include/smarty_globals.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php
index 7ddeb583..a8875c8f 100644
--- a/public/include/smarty_globals.inc.php
+++ b/public/include/smarty_globals.inc.php
@@ -65,7 +65,7 @@ $aGlobal = array(
 
 // Special calculations for PPS Values based on reward_type setting and/or available blocks
 if ($config['reward_type'] != 'block') {
-  $aGlobal['ppsvalue'] = number_format(round(50 / (pow(2,32) * $dDifficulty) * pow(2, $config['difficulty']), 12) ,12);
+  $aGlobal['ppsvalue'] = number_format(round($config['reward'] / (pow(2,32) * $dDifficulty) * pow(2, $config['difficulty']), 12) ,12);
 } else {
   // Try to find the last block value and use that for future payouts, revert to fixed reward if none found
   if ($aLastBlock = $block->getLast()) {