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

Merge branch 'master' into development

Browse Source
This commit is contained in:
Sebastian Grewe 2016-02-25 10:49:53 +01:00
commit 71b525812f
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/classes/tools.class.php
View File

@ -77,6 +77,8 @@ class Tools extends Base {
return 'btce'; return 'btce';
} else if (preg_match('/cryptsy.com/', $url)) { } else if (preg_match('/cryptsy.com/', $url)) {
return 'cryptsy'; return 'cryptsy';
} else if (preg_match('/cryptopia.co.nz/', $url)) {
return 'cryptopia';
} else if (preg_match('/cryptorush.in/', $url)) { } else if (preg_match('/cryptorush.in/', $url)) {
return 'cryptorush'; return 'cryptorush';
} else if (preg_match('/mintpal.com/', $url)) { } else if (preg_match('/mintpal.com/', $url)) {
@ -114,6 +116,9 @@ class Tools extends Base {
case 'cryptsy': case 'cryptsy':
return @$aData['return']['markets'][$strCurrency]['lasttradeprice']; return @$aData['return']['markets'][$strCurrency]['lasttradeprice'];
break; break;
case 'cryptopia':
return @$aData['Data']['LastPrice'];
break;
case 'cryptorush': case 'cryptorush':
return @$aData["$strCurrency/" . $this->config['price']['currency']]['last_trade']; return @$aData["$strCurrency/" . $this->config['price']['currency']]['last_trade'];
break; break;

6
include/config/admin_settings.inc.php
View File

@ -197,21 +197,21 @@ $aSettings['statistics'][] = array(
); );
$aSettings['statistics'][] = array( $aSettings['statistics'][] = array(
'display' => 'Pool Hashrate Modifier', 'type' => 'select', 'display' => 'Pool Hashrate Modifier', 'type' => 'select',
'options' => array( '1' => 'KH/s', '0.001' => 'MH/s', '0.000001' => 'GH/s', '0.000000001' => 'TH/s' ), 'options' => array( '1' => 'KH/s', '0.001' => 'MH/s', '0.000001' => 'GH/s', '0.000000001' => 'TH/s', '0.000000000001' => 'PH/s', '0.000000000000001' => 'EH/s' ),
'default' => '1', 'default' => '1',
'name' => 'statistics_pool_hashrate_modifier', 'value' => $setting->getValue('statistics_pool_hashrate_modifier'), 'name' => 'statistics_pool_hashrate_modifier', 'value' => $setting->getValue('statistics_pool_hashrate_modifier'),
'tooltip' => 'Auto-adjust displayed pool hashrates to a certain limit.' 'tooltip' => 'Auto-adjust displayed pool hashrates to a certain limit.'
); );
$aSettings['statistics'][] = array( $aSettings['statistics'][] = array(
'display' => 'Network Hashrate Modifier', 'type' => 'select', 'display' => 'Network Hashrate Modifier', 'type' => 'select',
'options' => array( '1' => 'KH/s', '0.001' => 'MH/s', '0.000001' => 'GH/s', '0.000000001' => 'TH/s' ), 'options' => array( '1' => 'KH/s', '0.001' => 'MH/s', '0.000001' => 'GH/s', '0.000000001' => 'TH/s', '0.000000000001' => 'PH/s', '0.000000000000001' => 'EH/s' ),
'default' => '1', 'default' => '1',
'name' => 'statistics_network_hashrate_modifier', 'value' => $setting->getValue('statistics_network_hashrate_modifier'), 'name' => 'statistics_network_hashrate_modifier', 'value' => $setting->getValue('statistics_network_hashrate_modifier'),
'tooltip' => 'Auto-adjust displayed network hashrates to a certain limit.' 'tooltip' => 'Auto-adjust displayed network hashrates to a certain limit.'
); );
$aSettings['statistics'][] = array( $aSettings['statistics'][] = array(
'display' => 'Personal Hashrate Modifier', 'type' => 'select', 'display' => 'Personal Hashrate Modifier', 'type' => 'select',
'options' => array( '1' => 'KH/s', '0.001' => 'MH/s', '0.000001' => 'GH/s', '0.000000001' => 'TH/s' ), 'options' => array( '1' => 'KH/s', '0.001' => 'MH/s', '0.000001' => 'GH/s', '0.000000001' => 'TH/s', '0.000000000001' => 'PH/s', '0.000000000000001' => 'EH/s' ),
'default' => '1', 'default' => '1',
'name' => 'statistics_personal_hashrate_modifier', 'value' => $setting->getValue('statistics_personal_hashrate_modifier'), 'name' => 'statistics_personal_hashrate_modifier', 'value' => $setting->getValue('statistics_personal_hashrate_modifier'),
'tooltip' => 'Auto-adjust displayed personal hashrates to a certain limit.' 'tooltip' => 'Auto-adjust displayed personal hashrates to a certain limit.'

2
include/smarty_globals.inc.php
View File

@ -47,7 +47,7 @@ if (! $statistics_ajax_refresh_interval = $setting->getValue('statistics_ajax_re
if (! $statistics_ajax_long_refresh_interval = $setting->getValue('statistics_ajax_long_refresh_interval')) $statistics_ajax_long_refresh_interval = 10; if (! $statistics_ajax_long_refresh_interval = $setting->getValue('statistics_ajax_long_refresh_interval')) $statistics_ajax_long_refresh_interval = 10;
// Small helper array // Small helper array
$aHashunits = array( '1' => 'KH/s', '0.001' => 'MH/s', '0.000001' => 'GH/s', '0.000000001' => 'TH/s' ); $aHashunits = array( '1' => 'KH/s', '0.001' => 'MH/s', '0.000001' => 'GH/s', '0.000000001' => 'TH/s', '0.000000000001' => 'PH/s', '0.000000000000001' => 'EH/s' );
// Global data for Smarty // Global data for Smarty
$aGlobal = array( $aGlobal = array(

8
sql/000_base_structure.sql
View File

@ -182,10 +182,10 @@ CREATE TABLE IF NOT EXISTS `statistics_shares` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`account_id` int(10) unsigned NOT NULL, `account_id` int(10) unsigned NOT NULL,
`block_id` int(10) unsigned NOT NULL, `block_id` int(10) unsigned NOT NULL,
`valid` int(11) NOT NULL, `valid` bigint(20) NOT NULL,
`invalid` int(11) NOT NULL DEFAULT '0', `invalid` bigint(20) NOT NULL DEFAULT '0',
`pplns_valid` int(11) NOT NULL, `pplns_valid` bigint(20) NOT NULL,
`pplns_invalid` int(11) NOT NULL DEFAULT '0', `pplns_invalid` bigint(20) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `account_id` (`account_id`), KEY `account_id` (`account_id`),
KEY `block_id` (`block_id`) KEY `block_id` (`block_id`)