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

Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap

Browse Source
This commit is contained in:
nrpatten 2014-03-04 03:41:26 -08:00
commit 36cda4a61c
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,9 +75,9 @@ class BitcoinWrapper extends BitcoinClient {
if (array_key_exists('networkhashps', $dNetworkHashrate)) {
$dNetworkHashrate = $dNetworkHashrate['networkhashps'];
} else if (array_key_exists('networkmhps', $dNetworkHashrate)) {
$dNetworkHashrate = $dNetworkHashrate['networkmhps'] * 1000;
$dNetworkHashrate = $dNetworkHashrate['networkmhps'] * 1000 * 1000;
} else if (array_key_exists('networkghps', $dNetworkHashrate)) {
$dNetworkHashrate = $dNetworkHashrate['networkghps'] * 1000 * 1000;
$dNetworkHashrate = $dNetworkHashrate['networkghps'] * 1000 * 1000 * 1000;
} else if (array_key_exists('hashespersec', $dNetworkHashrate)) {
$dNetworkHashrate = $dNetworkHashrate['hashespersec'];
} else if (array_key_exists('netmhashps', $dNetworkHashrate)) {

2
public/include/version.inc.php
View File

@ -2,7 +2,7 @@
$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
define('MPOS_VERSION', '0.0.4');
define('DB_VERSION', '0.0.6');
define('DB_VERSION', '0.0.7');
define('CONFIG_VERSION', '0.0.7');
// Fetch installed database version

4
public/templates/bootstrap/dashboard/js_api.tpl
View File

@ -21,6 +21,7 @@ $(document).ready(function(){
height: '25',
barWidth: 25,
barSpacing: 1,
chartRangeMin: 0
};
// Draw our sparkline graphs with our current static content
@ -88,6 +89,9 @@ $(document).ready(function(){
$.ajax({
url: url_dashboard,
dataType: 'json',
cache : false,
contentType : 'application/json; charset=utf-8',
type : 'GET',
success: function(data) {
refreshInformation(data);
refreshStaticData(data);

4
sql/000_base_structure.sql
View File

@ -46,7 +46,7 @@ CREATE TABLE IF NOT EXISTS `blocks` (
`account_id` int(255) unsigned DEFAULT NULL,
`worker_name` varchar(50) DEFAULT 'unknown',
`shares` int(255) unsigned DEFAULT NULL,
`share_id` int(255) DEFAULT NULL,
`share_id` bigint(30) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `height` (`height`,`blockhash`),
KEY `time` (`time`)
@ -133,7 +133,7 @@ CREATE TABLE IF NOT EXISTS `settings` (
UNIQUE KEY `setting` (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.6');
INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.7');
CREATE TABLE IF NOT EXISTS `shares` (
`id` bigint(30) NOT NULL AUTO_INCREMENT,

2
sql/017_blocks_update.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `blocks` CHANGE `share_id` `share_id` BIGINT( 30 ) NULL DEFAULT NULL ;
INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.7') ON DUPLICATE KEY UPDATE `value` = '0.0.7';