Merge branch 'next' into issue-444-theserapher

Author: MPOS123

README.md

@@ -80,7 +80,7 @@ The following feature have been implemented so far:
 
 * Fully re-written GUI with [Smarty][2] templates
 * Mobile WebUI
-* **SOON** VARDIFF Support
+* **NEW** VARDIFF Support
 * Reward Systems
  * Propotional
  * PPS

public/include/classes/bitcoinwrapper.class.php

@@ -49,15 +49,14 @@ public function getnetworkhashps() {
     try {
       $dNetworkHashrate = $this->query('getmininginfo');
       if (is_array($dNetworkHashrate) && array_key_exists('networkhashps', $dNetworkHashrate)) {
-        $dNetworkHashrate = $dNetworkHashrate['networkhashps'];
+        $dNetworkHashrate = $dNetworkHashrate['networkhashps'] / 1000;
       } else if (is_array($dNetworkHashrate) && array_key_exists('hashespersec', $dNetworkHashrate)) {
-        $dNetworkHashrate = $dNetworkHashrate['hashespersec'];
+        $dNetworkHashrate = $dNetworkHashrate['hashespersec'] / 1000;
+      } else if (is_array($dNetworkHashrate) && array_key_exists('netmhashps', $dNetworkHashrate)) {
+        $dNetworkHashrate = $dNetworkHashrate['netmhashps'] / 1000;
       }
     } catch (Exception $e) {
-      try { $dNetworkHashrate = $this->query('getnetworkhashps') / 1000; } catch (Exception $e) {
-        // Maybe we are SHA
-        try { $dNetworkHashrate = $this->query('gethashespersec') / 1000; } catch (Exception $e) { return false; }
-      }
+      return false;
     }
     return $this->memcache->setCache(__FUNCTION__, $dNetworkHashrate, 30);
   }