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-16 17:46:31 +02:00
commit ae9459eb92
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/include/config/global.inc.dist.php
View File

@ -78,9 +78,9 @@ $config['wallet']['password'] = 'testnet';
* currency = `BTC` * currency = `BTC`
* *
* Optional (cryptsy.com): * Optional (cryptsy.com):
* url = `https://pubapi.cryptsy.com` * url = `http://pubapi.cryptsy.com`
* target = `/api.php?method=marketdata`
* currency = `BTC` * currency = `BTC`
* target = `/api.php?method=marketdata`
**/ **/
$config['price']['url'] = 'https://btc-e.com'; $config['price']['url'] = 'https://btc-e.com';
$config['price']['target'] = '/api/2/ltc_usd/ticker'; $config['price']['target'] = '/api/2/ltc_usd/ticker';

3
public/include/pages/admin/wallet.inc.php
View File

@ -25,7 +25,8 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
$_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to wallet RPC service: ' . $bitcoin->can_connect(), 'TYPE' => 'errormsg'); $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to wallet RPC service: ' . $bitcoin->can_connect(), 'TYPE' => 'errormsg');
} }
// Fetch unconfirmed amount from blocks table // Fetch unconfirmed amount from blocks table
$aBlocksUnconfirmed = $block->getAllUnconfirmed(); empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
$dBlocksUnconfirmedBalance = 0; $dBlocksUnconfirmedBalance = 0;
if (!empty($aBlocksUnconfirmed)) if (!empty($aBlocksUnconfirmed))
foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount']; foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];

2
public/include/pages/api/public.inc.php
View File

@ -15,7 +15,7 @@ $bitcoin->can_connect() === true ? $dNetworkHashrate = $bitcoin->query('getnetwo
echo json_encode( echo json_encode(
array( array(
'pool_name' => $config['website']['name'], 'pool_name' => $setting->getValue('website_name'),
'hashrate' => $statistics->getCurrentHashrate(), 'hashrate' => $statistics->getCurrentHashrate(),
'workers' => $worker->getCountAllActiveWorkers(), 'workers' => $worker->getCountAllActiveWorkers(),
'shares_this_round' => $aShares['valid'], 'shares_this_round' => $aShares['valid'],