[FEATURE] Adding hashrate modifiers

* Allow admins to set hashrate speed displays via admin panel
 * Personal
 * Pool
 * Network
* Allows for easier integration of SHA coins

Fixes #652

public/include/config/admin_settings.inc.php

@@ -102,6 +102,27 @@ $aSettings['statistics'][] = array(
   'name' => 'statistics_block_count', 'value' => $setting->getValue('statistics_block_count'),
   'tooltip' => 'Blocks to fetch for the block statistics page.'
 );
+$aSettings['statistics'][] = array(
+  'display' => 'Pool Hashrate Modifier', 'type' => 'select',
+  'options' => array( '1' => 'KH/s', '0.001' => 'MH/s', '0.000001' => 'GH/s' ),
+  'default' => '1',
+  'name' => 'statistics_pool_hashrate_modifier', 'value' => $setting->getValue('statistics_pool_hashrate_modifier'),
+  'tooltip' => 'Auto-adjust displayed pool hashrates to a certain limit.'
+);
+$aSettings['statistics'][] = array(
+  'display' => 'Network Hashrate Modifier', 'type' => 'select',
+  'options' => array( '1' => 'KH/s', '0.001' => 'MH/s', '0.000001' => 'GH/s' ),
+  'default' => '1',
+  'name' => 'statistics_network_hashrate_modifier', 'value' => $setting->getValue('statistics_network_hashrate_modifier'),
+  'tooltip' => 'Auto-adjust displayed network hashrates to a certain limit.'
+);
+$aSettings['statistics'][] = array(
+  'display' => 'Personal Hashrate Modifier', 'type' => 'select',
+  'options' => array( '1' => 'KH/s', '0.001' => 'MH/s', '0.000001' => 'GH/s' ),
+  'default' => '1',
+  'name' => 'statistics_personal_hashrate_modifier', 'value' => $setting->getValue('statistics_personal_hashrate_modifier'),
+  'tooltip' => 'Auto-adjust displayed personal hashrates to a certain limit.'
+);
 $aSettings['acl'][] = array(
   'display' => 'Pool Statistics', 'type' => 'select',
   'options' => array( 0 => 'Private', 1 => 'Public'),

public/include/smarty_globals.inc.php

@@ -17,21 +17,45 @@ 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'];
+  try { $dNetworkHashrate = $bitcoin->query('getnetworkhashps') / 1000; } catch (Exception $e) {
+    // Maybe we are SHA
+    try { $dNetworkHashrate = $bitcoin->query('gethashespersec') / 1000; } catch (Exception $e) {
+      $dNetworkHashrate = 0;
+    }
+    $dNetworkHashrate = 0;
+  }
+} else {
+  $dNetworkHashrate = 0;
 }
 
-// Always fetch this since we need for ministats header
-$bitcoin->can_connect() === true ? $dNetworkHashrate = $bitcoin->query('getnetworkhashps') : $dNetworkHashrate = 0;
-
-// Fetch some data
-if (!$iCurrentActiveWorkers = $worker->getCountAllActiveWorkers()) $iCurrentActiveWorkers = 0;
+// Baseline pool hashrate for templates
+if ( ! $dPoolHashrateModifier = $setting->getValue('statistics_pool_hashrate_modifier') ) $dPoolHashrateModifier = 1;
 $iCurrentPoolHashrate =  $statistics->getCurrentHashrate();
-$iCurrentPoolShareRate = $statistics->getCurrentShareRate();
 
 // Avoid confusion, ensure our nethash isn't higher than poolhash
 if ($iCurrentPoolHashrate > $dNetworkHashrate) $dNetworkHashrate = $iCurrentPoolHashrate;
 
+// Baseline network hashrate for templates
+if ( ! $dPersonalHashrateModifier = $setting->getValue('statistics_personal_hashrate_modifier') ) $dPersonalHashrateModifier = 1;
+if ( ! $dNetworkHashrateModifier = $setting->getValue('statistics_network_hashrate_modifier') ) $dNetworkHashrateModifier = 1;
+
+// Apply modifier now
+$dNetworkHashrate = $dNetworkHashrate * $dNetworkHashrateModifier;
+$iCurrentPoolHashrate = $iCurrentPoolHashrate * $dPoolHashrateModifier;
+
+// Share rate of the entire pool
+$iCurrentPoolShareRate = $statistics->getCurrentShareRate();
+
+// Active workers
+if (!$iCurrentActiveWorkers = $worker->getCountAllActiveWorkers()) $iCurrentActiveWorkers = 0;
+
+// Small helper array
+$aHashunits = array( '1' => 'KH/s', '0.001' => 'MH/s', '0.000001' => 'GH/s' );
+
 // Global data for Smarty
 $aGlobal = array(
+  'hashunits' => array( 'pool' => $aHashunits[$dPoolHashrateModifier], 'network' => $aHashunits[$dNetworkHashrateModifier], 'personal' => $aHashunits[$dPersonalHashrateModifier]),
+  'hashmods' => array( 'personal' => $dPersonalHashrateModifier ),
   'hashrate' => $iCurrentPoolHashrate,
   'nethashrate' => $dNetworkHashrate,
   'sharerate' => $iCurrentPoolShareRate,
@@ -93,7 +117,7 @@ if (@$_SESSION['USERDATA']['id']) {
 
   // Other userdata that we can cache savely
   $aGlobal['userdata']['shares'] = $statistics->getUserShares($_SESSION['USERDATA']['id']);
-  $aGlobal['userdata']['hashrate'] = $statistics->getUserHashrate($_SESSION['USERDATA']['id']);
+  $aGlobal['userdata']['hashrate'] = $statistics->getUserHashrate($_SESSION['USERDATA']['id']) * $dPersonalHashrateModifier;
   $aGlobal['userdata']['sharerate'] = $statistics->getUserSharerate($_SESSION['USERDATA']['id']);
 
   switch ($config['payout_system']) {

public/templates/mmcFE/global/header.tpl

@@ -5,8 +5,8 @@
             <table border="0">
               <tr>
                 {if $GLOBAL.config.price.currency}<td><li>{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}: {$GLOBAL.price|default:"0"|number_format:"4"}&nbsp;&nbsp;&nbsp;&nbsp;</li></td>{/if}
-                <td><li>Network Hashrate: {($GLOBAL.nethashrate / 1000 / 1000 )|default:"0"|number_format:"3"} MH/s&nbsp;&nbsp;&nbsp;&nbsp;</li></td>
-                <td><li>Pool Hashrate: {($GLOBAL.hashrate / 1000)|number_format:"3"} MH/s&nbsp;&nbsp;&nbsp;&nbsp;</li></td>
+                <td><li>Network Hashrate: {$GLOBAL.nethashrate|default:"0"|number_format:"3"} {$GLOBAL.hashunits.network}&nbsp;&nbsp;&nbsp;&nbsp;</li></td>
+                <td><li>Pool Hashrate: {$GLOBAL.hashrate|number_format:"3"} {$GLOBAL.hashunits.pool}&nbsp;&nbsp;&nbsp;&nbsp;</li></td>
                 <td><li>Pool Sharerate: {$GLOBAL.sharerate|number_format:"2"} Shares/s&nbsp;&nbsp;&nbsp;&nbsp;</li></td>
                 <td><li>Pool Workers: {$GLOBAL.workers|default:"0"}&nbsp;&nbsp;&nbsp;&nbsp;</li></td>
               </tr>

public/templates/mmcFE/global/sidebar_pplns.tpl

@@ -16,7 +16,7 @@
                     </tr>
                     <tr>
                       <td><b>Hashrate</b></td>
-                      <td class="right">{$GLOBAL.userdata.hashrate|number_format} KH/s</td>
+                      <td class="right">{$GLOBAL.userdata.hashrate|number_format:"2"} {$GLOBAL.hashunits.personal}</td>
                     </tr>
                     <tr>
                       <td colspan="2"><b><u>Unpaid Shares</u></b> <span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Submitted shares between the last 120 confirms block until now.'></span></td>

public/templates/mmcFE/global/sidebar_pps.tpl

@@ -11,7 +11,7 @@
                     </tr>
                     <tr>
                       <td><b>Hashrate</b></td>
-                      <td class="right">{$GLOBAL.userdata.hashrate|number_format} KH/s</td>
+                      <td class="right">{$GLOBAL.userdata.hashrate|number_format:"2"} {$GLOBAL.hashunits.personal}</td>
                     </tr>
                     <tr>
                       <td><b>Share Rate</b></td>

public/templates/mmcFE/global/sidebar_prop.tpl

@@ -11,7 +11,7 @@
                     </tr>
                     <tr>
                       <td><b>Hashrate</b></td>
-                      <td class="right">{$GLOBAL.userdata.hashrate|number_format} KH/s</td>
+                      <td class="right">{$GLOBAL.userdata.hashrate|number_format:"2"} {$GLOBAL.hashunits.personal}</td>
                     </tr>
                     <tr>
                       <td colspan="2"><b><u>Unpaid Shares</u></b> <span id='tt'><img src='{$PATH}/images/questionmark.png' height='15px' width='15px' title='Submitted shares between the last 120 confirms block until now.'></span></td>

public/templates/mmcFE/statistics/pool/authenticated.tpl

@@ -9,7 +9,7 @@
   <tbody>
     <tr>
       <td class="leftheader">Pool Hash Rate</td>
-      <td>{($GLOBAL.hashrate / 1000)|number_format:"3"} Mhash/s</td>
+      <td>{$GLOBAL.hashrate|number_format:"3"} {$GLOBAL.hashunits.pool}</td>
     </tr>
     <tr>
       <td class="leftheader">Pool Efficiency</td>

public/templates/mmcFE/statistics/pool/contributors_hashrate.tpl

@@ -5,7 +5,7 @@
       <tr style="background-color:#B6DAFF;">
         <th align="left">Rank</th>
         <th align="left" scope="col">User Name</th>
-        <th class="right" scope="col">KH/s</th>
+        <th class="right" scope="col">{$GLOBAL.hashunits.personal}</th>
         <th class="right">{$GLOBAL.config.currency}/Day</th>
         {if $GLOBAL.config.price.currency}<th class="right">{$GLOBAL.config.price.currency}/Day</th>{/if}
       </tr>
@@ -18,7 +18,7 @@
       <tr{if $GLOBAL.userdata.username == $CONTRIBHASHES[contrib].account}{assign var=listed value=1} style="background-color:#99EB99;"{else} class="{cycle values="odd,even"}"{/if}>
         <td>{$rank++}</td>
         <td>{if $CONTRIBHASHES[contrib].is_anonymous|default:"0" == 1}anonymous{else}{$CONTRIBHASHES[contrib].account|escape}{/if}</td>
-        <td class="right">{$CONTRIBHASHES[contrib].hashrate|number_format}</td>
+        <td class="right">{($CONTRIBHASHES[contrib].hashrate * $GLOBAL.hashmods.personal)|number_format:"2"}</td>
         <td class="right">{$estday|number_format:"3"}</td>
         {if $GLOBAL.config.price.currency}<td class="right">{($estday * $GLOBAL.price)|default:"n/a"|number_format:"2"}</td>{/if}
       </tr>