RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' into issue-444-theserapher

Browse Source
This commit is contained in:
Sebastian Grewe 2013-09-30 13:43:44 +02:00
commit fe982c112c
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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

11
public/include/classes/bitcoinwrapper.class.php
View File

@ -49,15 +49,14 @@ class BitcoinWrapper extends BitcoinClient {
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);
}