From e5ef906494b33351449faf100984c90a135dcb3e Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Thu, 22 May 2014 16:06:13 +0200 Subject: [PATCH 01/24] [UPDATE] mute blocknotify --- templates/bootstrap/dashboard/blocks/default.tpl | 3 +++ templates/bootstrap/dashboard/default.tpl | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/templates/bootstrap/dashboard/blocks/default.tpl b/templates/bootstrap/dashboard/blocks/default.tpl index 46467cd6..85201d0c 100644 --- a/templates/bootstrap/dashboard/blocks/default.tpl +++ b/templates/bootstrap/dashboard/blocks/default.tpl @@ -37,6 +37,9 @@ +
+ Blocknotify Sound on / off +
{/if} diff --git a/templates/bootstrap/dashboard/default.tpl b/templates/bootstrap/dashboard/default.tpl index e042fa1e..dbb3b8aa 100644 --- a/templates/bootstrap/dashboard/default.tpl +++ b/templates/bootstrap/dashboard/default.tpl @@ -1,6 +1,19 @@ {if $smarty.session.AUTHENTICATED|default} +
From 6210a1a28fd05c75b6e88bda59c1dd55c1fb2f7b Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Fri, 23 May 2014 11:07:56 +0200 Subject: [PATCH 02/24] [UPDATE] changed behavior and use jQuery --- .../bootstrap/dashboard/blocks/default.tpl | 4 ++-- templates/bootstrap/dashboard/default.tpl | 13 ------------- templates/bootstrap/dashboard/js/api.tpl | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/templates/bootstrap/dashboard/blocks/default.tpl b/templates/bootstrap/dashboard/blocks/default.tpl index 85201d0c..376e9d08 100644 --- a/templates/bootstrap/dashboard/blocks/default.tpl +++ b/templates/bootstrap/dashboard/blocks/default.tpl @@ -38,8 +38,8 @@
- Blocknotify Sound on / off +
-{/if} +{/if} \ No newline at end of file diff --git a/templates/bootstrap/dashboard/default.tpl b/templates/bootstrap/dashboard/default.tpl index dbb3b8aa..e042fa1e 100644 --- a/templates/bootstrap/dashboard/default.tpl +++ b/templates/bootstrap/dashboard/default.tpl @@ -1,19 +1,6 @@ {if $smarty.session.AUTHENTICATED|default} -
diff --git a/templates/bootstrap/dashboard/js/api.tpl b/templates/bootstrap/dashboard/js/api.tpl index f81a1fe0..f2c2b7f3 100644 --- a/templates/bootstrap/dashboard/js/api.tpl +++ b/templates/bootstrap/dashboard/js/api.tpl @@ -5,6 +5,7 @@ $(document).ready(function(){ var audioPath = "{/literal}{$PATH}{literal}/audio/"; var manifest = [ {id:"ding", src:"ding.ogg"} ]; + var muteFlag = 1; createjs.Sound.alternateExtensionseExtensions = ["mp3"]; createjs.Sound.registerManifest(manifest, audioPath); @@ -250,6 +251,23 @@ $(document).ready(function(){ } }); })(); + + // Mute Button + $('#muteButton').click(function(){ + if(muteFlag == 2) { + muteFlag = 1; + createjs.Sound.setMute(false); + $(this).toggleClass("btn-xs btn-danger").toggleClass("btn-xs btn-success"); + //$(this).find($(".fa")).removeClass('fa-volume-off').addClass('fa-volume-up'); + } else { + muteFlag = 2; + createjs.Sound.setMute(true); + $(this).toggleClass("btn-xs btn-success").toggleClass("btn-xs btn-danger"); + //$(this).find($(".fa")).removeClass('fa-volume-up').addClass('fa-volume-off'); + } + }); + + }); {/literal} From 9072d94106a97ed6f8932902635e75c5d6797b8b Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Mon, 26 May 2014 09:29:46 +0200 Subject: [PATCH 03/24] Create 0.0.10_to_0.0.11.inc.php --- upgrade/definitions/0.0.10_to_0.0.11.inc.php | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 upgrade/definitions/0.0.10_to_0.0.11.inc.php diff --git a/upgrade/definitions/0.0.10_to_0.0.11.inc.php b/upgrade/definitions/0.0.10_to_0.0.11.inc.php new file mode 100644 index 00000000..7f332dac --- /dev/null +++ b/upgrade/definitions/0.0.10_to_0.0.11.inc.php @@ -0,0 +1,31 @@ +getValue('DB_VERSION'); // Our actual version installed + + // Upgrade specific variables + $aSql[] = "ALTER TABLE `shares_archive` MODIFY `id` bigint(30)"; + $aSql[] = "ALTER TABLE `shares_archive` MODIFY `share_id` bigint(30)"; + $aSql[] = "UPDATE " . $setting->getTableName() . " SET value = '0.0.11' WHERE name = 'DB_VERSION'"; + + if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) { + // Run the upgrade + echo '- Starting database migration to version ' . $db_version_new . PHP_EOL; + foreach ($aSql as $sql) { + echo '- Preparing: ' . $sql . PHP_EOL; + $stmt = $mysqli->prepare($sql); + if ($stmt && $stmt->execute()) { + echo '- success' . PHP_EOL; + } else { + echo '- failed: ' . $mysqli->error . PHP_EOL; + exit(1); + } + } + } +} +?> From 62ed5699dcd6664fd8dea4c80071c2f07c4e6651 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Mon, 26 May 2014 09:30:20 +0200 Subject: [PATCH 04/24] Create 012_shares_archive_update.sql --- sql/012_shares_archive_update.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/012_shares_archive_update.sql diff --git a/sql/012_shares_archive_update.sql b/sql/012_shares_archive_update.sql new file mode 100644 index 00000000..1860a5b7 --- /dev/null +++ b/sql/012_shares_archive_update.sql @@ -0,0 +1,3 @@ +ALTER TABLE shares_archive MODIFY id bigint(30); +ALTER TABLE shares_archive MODIFY share_id bigint(30); +UPDATE TABLE settings SET value = '0.0.11' WHERE name = 'DB_VERSION'; From 5bbc8ac5f7ab31419596da1f3ed71deb626ac6d5 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Mon, 26 May 2014 09:30:49 +0200 Subject: [PATCH 05/24] Update global.inc.dist.php --- include/config/global.inc.dist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/config/global.inc.dist.php b/include/config/global.inc.dist.php index ca1069dd..2a357213 100644 --- a/include/config/global.inc.dist.php +++ b/include/config/global.inc.dist.php @@ -7,7 +7,7 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1; * https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-config-version **/ $config['version'] = '0.0.8'; -$config['version_url'] = 'https://raw.githubusercontent.com/MPOS/php-mpos/master/public/include/version.inc.php'; +$config['version_url'] = 'https://raw.githubusercontent.com/MPOS/php-mpos/master/include/version.inc.php'; /** * Unless you disable this, we'll do a quick check on your config first. From 8dded88a5773f3eba01b6e990a0dcfa424bb7329 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Mon, 26 May 2014 09:31:08 +0200 Subject: [PATCH 06/24] Update version.inc.php --- include/version.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/version.inc.php b/include/version.inc.php index f0ea33f7..91d93ee8 100644 --- a/include/version.inc.php +++ b/include/version.inc.php @@ -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.10'); +define('DB_VERSION', '0.0.11'); define('CONFIG_VERSION', '0.0.8'); define('HASH_VERSION', 1); From 7f0f2fffacfd559f86cd2bad384ec27f189db27a Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Mon, 26 May 2014 09:31:43 +0200 Subject: [PATCH 07/24] Update 000_base_structure.sql --- sql/000_base_structure.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/000_base_structure.sql b/sql/000_base_structure.sql index 3c55f36c..63f57241 100644 --- a/sql/000_base_structure.sql +++ b/sql/000_base_structure.sql @@ -155,8 +155,8 @@ CREATE TABLE IF NOT EXISTS `shares` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `shares_archive` ( - `id` int(255) unsigned NOT NULL AUTO_INCREMENT, - `share_id` int(255) unsigned NOT NULL, + `id` bigint(30) NOT NULL AUTO_INCREMENT, + `share_id` bigint(30) NOT NULL, `username` varchar(120) NOT NULL, `our_result` enum('Y','N') DEFAULT NULL, `upstream_result` enum('Y','N') DEFAULT NULL, From c4ecd18052c9040ac44084fc8f4e67bcd3d3b17d Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Wed, 28 May 2014 15:20:49 +0200 Subject: [PATCH 08/24] [UPDATE] config option for register with valid coin address --- include/classes/user.class.php | 10 ++++++---- include/config/global.inc.dist.php | 6 ++++++ include/pages/register/register.inc.php | 11 ++++++++--- include/smarty_globals.inc.php | 1 + templates/bootstrap/register/default.tpl | 2 ++ 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/include/classes/user.class.php b/include/classes/user.class.php index a8d0f308..7cb0d58b 100644 --- a/include/classes/user.class.php +++ b/include/classes/user.class.php @@ -741,9 +741,11 @@ class User extends Base { $this->setErrorMessage('Username exceeding character limit'); return false; } - if (!$this->bitcoin->validateaddress($coinaddress)) { - $this->setErrorMessage('Coin address is not valid'); - return false; + if (!is_null($coinaddress)) { + if (!$this->bitcoin->validateaddress($coinaddress)) { + $this->setErrorMessage('Coin address is not valid'); + return false; + } } if (preg_match('/[^a-z_\-0-9]/i', $username)) { $this->setErrorMessage('Username may only contain alphanumeric characters'); @@ -841,7 +843,7 @@ class User extends Base { } else { $this->setErrorMessage( 'Unable to register' ); $this->debug->append('Failed to insert user into DB: ' . $this->mysqli->error); - if ($stmt->sqlstate == '23000') $this->setErrorMessage( 'Username or email already registered' ); + if ($stmt->sqlstate == '23000') $this->setErrorMessage( 'Username, email or Coinaddress already registered' ); return false; } return false; diff --git a/include/config/global.inc.dist.php b/include/config/global.inc.dist.php index ca1069dd..9d4e0343 100644 --- a/include/config/global.inc.dist.php +++ b/include/config/global.inc.dist.php @@ -15,6 +15,12 @@ $config['version_url'] = 'https://raw.githubusercontent.com/MPOS/php-mpos/master */ $config['skip_config_tests'] = false; +/** + * Unless you disable this, we'll do a check for a valid coin address on registration. + * https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-coin-address-check + */ +$config['check_valid_coinaddress'] = true; + /** * Defines * Debug setting and salts for hashing passwords diff --git a/include/pages/register/register.inc.php b/include/pages/register/register.inc.php index 60d988c6..87f856ee 100644 --- a/include/pages/register/register.inc.php +++ b/include/pages/register/register.inc.php @@ -26,10 +26,15 @@ if ($setting->getValue('disable_invitations') && $setting->getValue('lock_regist if ($setting->getValue('recaptcha_enabled') != 1 || $setting->getValue('recaptcha_enabled_registrations') != 1 || $rsp->is_valid) { // Check if recaptcha is enabled, process form data if valid or disabled isset($_POST['token']) ? $token = $_POST['token'] : $token = ''; - if ($user->register(@$_POST['username'], @$_POST['coinaddress'], @$_POST['password1'], @$_POST['password2'], @$_POST['pin'], @$_POST['email1'], @$_POST['email2'], @$_POST['tac'], $token)) { - (!$setting->getValue('accounts_confirm_email_disabled')) ? $_SESSION['POPUP'][] = array('CONTENT' => 'Please check your mailbox to activate this account') : $_SESSION['POPUP'][] = array('CONTENT' => 'Account created, please login'); + isset($_POST['coinaddress']) ? $validcoinaddress = $_POST['coinaddress'] : $validcoinaddress = NULL; + if ($config['check_valid_coinaddress'] AND empty($validcoinaddress)) { + $_SESSION['POPUP'][] = array('CONTENT' => 'Please enter a valid Wallet Address', 'TYPE' => 'alert alert-danger'); } else { - $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to create account: ' . $user->getError(), 'TYPE' => 'alert alert-danger'); + if ($user->register(@$_POST['username'], $validcoinaddress, @$_POST['password1'], @$_POST['password2'], @$_POST['pin'], @$_POST['email1'], @$_POST['email2'], @$_POST['tac'], $token)) { + (!$setting->getValue('accounts_confirm_email_disabled')) ? $_SESSION['POPUP'][] = array('CONTENT' => 'Please check your mailbox to activate this account') : $_SESSION['POPUP'][] = array('CONTENT' => 'Account created, please login'); + } else { + $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to create account: ' . $user->getError(), 'TYPE' => 'alert alert-danger'); + } } } } else { diff --git a/include/smarty_globals.inc.php b/include/smarty_globals.inc.php index b94b661d..b45b1eda 100644 --- a/include/smarty_globals.inc.php +++ b/include/smarty_globals.inc.php @@ -63,6 +63,7 @@ $aGlobal = array( 'reward' => $config['reward_type'] == 'fixed' ? $config['reward'] : $block->getAverageAmount(), 'price' => $setting->getValue('price'), 'twofactor' => $config['twofactor'], + 'coinaddresscheck' => $config['check_valid_coinaddress'], 'csrf' => $config['csrf'], 'config' => array( 'date' => $setting->getValue('system_date_format', '%m/%d/%Y %H:%M:%S'), diff --git a/templates/bootstrap/register/default.tpl b/templates/bootstrap/register/default.tpl index 722f903f..2f49357b 100644 --- a/templates/bootstrap/register/default.tpl +++ b/templates/bootstrap/register/default.tpl @@ -22,11 +22,13 @@
+ {if $GLOBAL.coinaddresscheck|default:"1"}
+ {/if} (Strength)
From 36d77bb554aa206e8d26d5fcff2eb54651e0c2e6 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Wed, 28 May 2014 15:27:04 +0200 Subject: [PATCH 09/24] [UPDATE] changed wiki url --- include/config/global.inc.dist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/config/global.inc.dist.php b/include/config/global.inc.dist.php index 9d4e0343..c01c7b45 100644 --- a/include/config/global.inc.dist.php +++ b/include/config/global.inc.dist.php @@ -17,7 +17,7 @@ $config['skip_config_tests'] = false; /** * Unless you disable this, we'll do a check for a valid coin address on registration. - * https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-coin-address-check + * https://github.com/MPOS/php-mpos/wiki/Config-Setup#check-for-valid-wallet-address */ $config['check_valid_coinaddress'] = true; From 61f52f46ae129e245ac7bcb96c92fc25922aaa66 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Tue, 3 Jun 2014 13:00:48 +0200 Subject: [PATCH 10/24] Delete 012_shares_archive_update.sql --- sql/012_shares_archive_update.sql | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 sql/012_shares_archive_update.sql diff --git a/sql/012_shares_archive_update.sql b/sql/012_shares_archive_update.sql deleted file mode 100644 index 1860a5b7..00000000 --- a/sql/012_shares_archive_update.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE shares_archive MODIFY id bigint(30); -ALTER TABLE shares_archive MODIFY share_id bigint(30); -UPDATE TABLE settings SET value = '0.0.11' WHERE name = 'DB_VERSION'; From cfd1bcc9113176fc4d175030e6849df6ae7c4946 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Wed, 4 Jun 2014 12:46:18 +0200 Subject: [PATCH 11/24] [ADDED] test config --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c669bc09..b4976dfc 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ /logs/* # Test configs +/include/config/global.inc.test.php /include/config/global.inc.scrypt.php /include/config/global.inc.sha.php From 80909ef2db877516718488ebd5e3e644bdde5dd4 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Wed, 4 Jun 2014 14:45:51 +0200 Subject: [PATCH 12/24] [UPDATE] change loading behavior, check if soundjs can be executed --- .../bootstrap/dashboard/blocks/default.tpl | 6 +++-- templates/bootstrap/dashboard/js/api.tpl | 27 +++++++++++++------ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/templates/bootstrap/dashboard/blocks/default.tpl b/templates/bootstrap/dashboard/blocks/default.tpl index 376e9d08..dabd89d9 100644 --- a/templates/bootstrap/dashboard/blocks/default.tpl +++ b/templates/bootstrap/dashboard/blocks/default.tpl @@ -37,8 +37,10 @@
-
- +
+
+ +
diff --git a/templates/bootstrap/dashboard/js/api.tpl b/templates/bootstrap/dashboard/js/api.tpl index f2c2b7f3..91891fe1 100644 --- a/templates/bootstrap/dashboard/js/api.tpl +++ b/templates/bootstrap/dashboard/js/api.tpl @@ -3,11 +3,20 @@ @@ -147,4 +147,4 @@ - + \ No newline at end of file From 14eb0f56fce551d5536e9e0d27646b0ea39b1596 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Tue, 10 Jun 2014 15:38:21 +0200 Subject: [PATCH 19/24] README update Updated some outdated content --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 79bc2be4..90335e1c 100644 --- a/README.md +++ b/README.md @@ -79,15 +79,14 @@ The following feature have been implemented so far: * Fully re-written GUI with [Smarty][2] templates * Full file based template support - * **NEW** SQL based templates -* Mobile WebUI -* Scrypt, SHA256, VARDIFF Support +* VARDIFF Support * Reward Systems * Propotional, PPS and PPLNS * New Theme * Live Dashboard * AJAX Support * Overhauled API + * Bootstrap * Web User accounts * Re-Captcha protected registration form * Worker accounts @@ -95,7 +94,7 @@ The following feature have been implemented so far: * Worker hashrates * Pool statistics * Block statistics -* Pool donations, fees and block bonuses +* Pool donations, bonuses, fees and block bonuses * Manual and auto payout * Transaction list * Admin Panel @@ -105,7 +104,6 @@ The following feature have been implemented so far: * User Transactions * News Posts * Pool Settings - * Templates * Pool Workers * User Reports * Template Overwrite @@ -115,9 +113,11 @@ The following feature have been implemented so far: * Auto Payout * Manual Payout * User-to-user Invitation System -* Support for various coins via config +* Support for various coins via coin class and config * All scrypt coins * All sha256d coins + * All x11 coins + * Others may be supported by creating a custom coin class Installation ============ @@ -131,7 +131,7 @@ This project was meant to allow users to easily customize the system and templat If you are just using the system, there will be no need to adjust anything. Things will work out of the box! But if you plan on creating your own theme, things are pretty easy: -* Create a new theme folder in `public/templates/` +* Create a new theme folder in `templates/` * Create a new site_assets folder in `public/site_assets` * Create your own complete custom template or copy from an existing one * Change your theme in the `Admin Panel` and point it to the newly created folder From 44dd97b2cbd0bc0080f3dda5ee1a2b19979d7cf6 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Sun, 15 Jun 2014 16:01:31 +0200 Subject: [PATCH 20/24] [CHANGE] Find max ID first --- include/classes/share.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/classes/share.class.php b/include/classes/share.class.php index b50188f8..23a7911e 100644 --- a/include/classes/share.class.php +++ b/include/classes/share.class.php @@ -129,8 +129,8 @@ class Share Extends Base { * return array data Returns an array with usernames as keys for easy access **/ function getArchiveShares($iCount) { - $iMinId = $this->getMinArchiveShareId($iCount); $iMaxId = $this->getMaxArchiveShareId(); + $iMinId = $this->getMinArchiveShareId($iCount); $stmt = $this->mysqli->prepare(" SELECT a.id, From 22aff8ed2f5e53e69b4f7a20232f0316c045b8f0 Mon Sep 17 00:00:00 2001 From: Glen Date: Wed, 18 Jun 2014 13:05:51 +1000 Subject: [PATCH 21/24] Corrected Uppercase 'IDLE' To Match Format Corrected the word 'idle' to match the text format of all other notification text. IDLE > Idle --- templates/bootstrap/account/notifications/default.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/bootstrap/account/notifications/default.tpl b/templates/bootstrap/account/notifications/default.tpl index f1fa1a0d..12dbcd0b 100644 --- a/templates/bootstrap/account/notifications/default.tpl +++ b/templates/bootstrap/account/notifications/default.tpl @@ -13,7 +13,7 @@ {if $DISABLE_IDLEWORKERNOTIFICATIONS|default:"" != 1} - + @@ -93,7 +93,7 @@ {if $NOTIFICATIONS[notification].type == new_block}New Block {else if $NOTIFICATIONS[notification].type == payout}Payout -{else if $NOTIFICATIONS[notification].type == idle_worker}IDLE Worker +{else if $NOTIFICATIONS[notification].type == idle_worker}Idle Worker {else if $NOTIFICATIONS[notification].type == success_login}Successful Login {/if} From bc7596ed46b48fb6b4d0b59fc1221989827edb41 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Fri, 20 Jun 2014 16:02:43 +0200 Subject: [PATCH 22/24] Removed codeship img --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 90335e1c..5d54bffb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Description [ ![Codeship Status for TheSerapher/php-mpos](https://www.codeship.io/projects/40fa7600-61a6-0131-3fd3-367b94dc0d60/status?branch=next)](https://www.codeship.io/projects/12276) +Description =========== MPOS is a web based Mining Portal for various crypto currencies. It was created by [TheSerapher](https://github.com/TheSerapher) and has hence grown quite large. Recently it was migrated into a Github Organization to make development easier. It's a community driven open source project. Support can be requested on IRC at https://webchat.freenode.net/?channels=#mpos From e7f140853d141499d79a019f8bb193a9f904b528 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Fri, 20 Jun 2014 16:06:06 +0200 Subject: [PATCH 23/24] Added some other donation addresses --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d54bffb..61ea994b 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,10 @@ Donations to this project are going directly to [TheSerapher](https://github.com * LTC address: `Lge95QR2frp9y1wJufjUPCycVsg5gLJPW8` * BTC address: `1HuYK6WPU8o3yWCrAaADDZPRpL5QiXitfv` -* DOGE Address: `D6YtvxFGBmaD8Yq3i8LZsBQVPvCbZwCDzF` +* DOGE address: `DANk8bnc3vHEf7Jthaxq1Xgn1BSiArNdjG` +* 42Coin address: `4VxA6Ht59Mj6ikhA4gDXLiHuAaDCJEvYTZ` +* FST address: `fiRqMgZyhjTN1GSEB3ZxV35JXsE5bjEaQ2` +* FRK address: `FDcgGZjX2B29qevSuiuQVwXhkNhtQT4cEW` * Cryptsy Trade Key: `6ff7292142463b7b80cbbbdfc52334ba89727b11` Website Footer From 4591c1f51489632394a50b7e25206e7e59107426 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Wed, 25 Jun 2014 10:08:43 +0200 Subject: [PATCH 24/24] [FIX] Fixes #2252 --- include/smarty_globals.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/smarty_globals.inc.php b/include/smarty_globals.inc.php index b45b1eda..ea13a6d1 100644 --- a/include/smarty_globals.inc.php +++ b/include/smarty_globals.inc.php @@ -26,7 +26,7 @@ if ( ! $dPoolHashrateModifier = $setting->getValue('statistics_pool_hashrate_mod $iCurrentPoolHashrate = $statistics->getCurrentHashrate(); // Avoid confusion, ensure our nethash isn't higher than poolhash -if ($iCurrentPoolHashrate > $dNetworkHashrate / 1000) $dNetworkHashrate = $iCurrentPoolHashrate; +if ($iCurrentPoolHashrate > $dNetworkHashrate / 1000) $dNetworkHashrate = $iCurrentPoolHashrate * 1000; // Baseline network hashrate for templates if ( ! $dPersonalHashrateModifier = $setting->getValue('statistics_personal_hashrate_modifier') ) $dPersonalHashrateModifier = 1;