Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

v2.1

  • Loading branch information...
Stoyvo committed May 27, 2015
2 parents c3c5114 + f845fca commit 26f0793453677819bf3e7db51d9d052766a2844f
Showing with 1,653 additions and 559 deletions.
  1. +78 −7 CHANGELOG.md
  2. +1 −1 README.md
  3. +2 −2 ajax.php
  4. +17 −19 css/cryptoglance-base.css
  5. BIN images/coin/burstcoin.png
  6. BIN images/coin/dogecoindark.png
  7. +1 −1 includes/classes/config/abstract.php
  8. +52 −3 includes/classes/config/pools.php
  9. +35 −0 includes/classes/firstrally.php
  10. +38 −23 includes/classes/miners/cgminer.php
  11. +179 −0 includes/classes/mobileminer.php
  12. +90 −0 includes/classes/pools/antpool.php
  13. +5 −0 includes/classes/pools/bitcoinaffiliatenetwork.php
  14. +57 −0 includes/classes/pools/bitminter.php
  15. +28 −15 includes/classes/pools/btcguild.php
  16. +53 −0 includes/classes/pools/burstninja.php
  17. +9 −1 includes/classes/pools/ckpool.php
  18. +18 −13 includes/classes/pools/eclipse.php
  19. +6 −1 includes/classes/pools/eligius.php
  20. +14 −9 includes/classes/pools/magicpool.php
  21. +7 −2 includes/classes/pools/mpos.php
  22. +16 −9 includes/classes/pools/multipoolus.php
  23. +104 −0 includes/classes/pools/nicehash.php
  24. +20 −0 includes/classes/pools/nomp.php
  25. +64 −0 includes/classes/pools/p2pool.php
  26. +18 −13 includes/classes/pools/simplecoin.php
  27. +62 −0 includes/classes/pools/slush.php
  28. +6 −1 includes/classes/pools/trademybit.php
  29. +12 −7 includes/classes/pools/wafflepool.php
  30. +11 −0 includes/classes/pools/westhash.php
  31. +5 −0 includes/classes/rigs.php
  32. +6 −3 includes/classes/wallets.php
  33. +31 −0 includes/classes/wallets/burstcoin.php
  34. +31 −0 includes/classes/wallets/dogecoindark.php
  35. +33 −6 includes/cryptoglance.php
  36. +0 −5 includes/footer.php
  37. +25 −12 includes/functions.php
  38. +2 −2 includes/head.php
  39. +0 −1 includes/header.php
  40. +3 −4 includes/inc.php
  41. +1 −1 includes/scripts.php
  42. +8 −8 index.php
  43. +41 −6 js/cryptoglance-ui.js
  44. +61 −0 js/dashboard/MobileMiner.js
  45. +15 −3 js/dashboard/Pool.js
  46. +3 −1 js/dashboard/Rig.js
  47. +67 −46 js/dashboard/RigCollection.js
  48. +20 −17 js/dashboard/Wallet.js
  49. +5 −7 js/dashboard/WalletCollection.js
  50. +26 −10 js/dashboard/script.js
  51. +0 −108 js/rig/old-script.js
  52. +26 −2 js/settings.js
  53. +5 −2 js/version.js
  54. +0 −4 js/wallet/script.js
  55. +4 −4 permissionfix.sh
  56. +105 −80 settings.php
  57. +18 −5 templates/modals/add_pool.php
  58. +0 −20 templates/modals/qrcode-donate-doge.php
  59. +0 −20 templates/modals/qrcode-donate-ltc.php
  60. +0 −20 templates/modals/qrcode-donate-rdd.php
  61. +0 −20 templates/modals/qrcode-donate-vtc.php
  62. +1 −1 templates/panels/pool.php
  63. +1 −1 templates/panels/rig.php
  64. +2 −2 templates/panels/wallet.php
  65. +102 −8 update.php
  66. +3 −3 wallet.php
@@ -1,6 +1,82 @@

[ v2.1 ]

FEATURES
========
- MobileMiner support. Can be enabled via Settings. http://www.mobileminerapp.com/
- Added app specific way to zoom in/out
- Zoom Out: CTRL + <
- Zoom In: CTRL + >
- Reset Zoom: CTRL + /
- Added manual update check in Settings page
- Added New Zealand Dollar as a Fiat option in wallets
- Added current FIAT price of a coin
- NOMP now detects the coin being mined for a specific address. Useful for profit-switching pools
- Pools have Offline mode. If no data is returned, or fails to connect, it is "offline"

POOLS
=====
- [+POOL] AntPool
- [+POOL] BitMinter
- [+POOL] Burst.Ninja
- [+POOL] BitcoinCZ aka Slush
- [+POOL] NiceHash/WestHash
- [+POOL] P2Pool

POOLS
=====
- [+POOL] NiceHash/WestHash
- [+POOL] BitcoinCZ aka Slush
- [+POOL] AntPool
- [+POOL] BitMinter
- [+POOL] P2Pool

ALGORITHMS
==========
- [+Algorithm] Blake-256
- [+Algorithm] Groestl
- [+Algorithm] Jackpot
- [+Algorithm] Lyra2RE
- [+Algorithm] Neos-Blake
- [+Algorithm] NeoScrypt
- [+Algorithm] WHIRL
- [+Algorithm] X17

COINS
=====
- [+COIN] Burstcoin
- [+COIN] DogeCoin Dark

HOTFIXES
========
- Changed from BitcoinIndex.es to FirstRally.com
- Fixed issue with Bitcoin Affiliate Network saving an empty name/label
- Fixed incorrect reporting of rejected share warning
- Added permission checking to the update process
- Fixed permissionfix script, should correctly set permissions on parent folder
- Fixed issue with pools not loading sometimes
- Added round duration to CKPool
- Fixed incorrect BTC Guild pool hashrate
- Fixed incorrect BTC Guild worker count
- Removed useless BTC column when looking at a BTC wallet
- Update page will now display correctly for those with slow connections
- Attempt to fix issue where the update.zip does not delete in some cases
- Fixed issue where offline rigs would randomly appear/disappear in the overview panel
- Fixed issue with Antpool on Windows
- Fixed issue when using only 1 rig
- Padded the time-out for users with 60+ rigs
- Fixed issue with Linux users who do not have posix installed

KNOWN ISSUES
============
- Users with lots of rigs may experience a long start-up time
- Miner Failover may report incorrect active pool
- Wallets can take a long time to load

---

[ v2.0.2 ]

FEATURES
========
- If rejected shares are greater than accepted shares, rig status appears red (requires attention)
@@ -11,11 +87,6 @@
- Fixed issue where Active Pool was sometimes displaying as "--"
- Fixed login screen alerts on first login + login failure

KNOWN ISSUES
========
- Pools may not load sometimes
- Wallets can take a long time to load

---

[ v2.0.1 ]
@@ -45,7 +116,7 @@
- Rigs Algorithm is auto-set when using sgMiner v5+
- Ability to reset rig stats
- Ability to reset rig stats on pool change
- New FIAT conversions for most coins (Thanks to FunkyC: https://bitcoinindex.es/)
- New FIAT conversions for most coins (Thanks to FunkyC: https://firstrally.com/)
- New debug command to see raw miner data: CTRL + D

POOLS
@@ -69,7 +69,7 @@ cryptoGlance is an open-source, self-hosted PHP webapp providing you with a glan
<li>Rigs Algorithm is auto-set when using sgMiner v5+</li>
<li>Ability to reset rig stats</li>
<li>Ability to reset rig stats on pool change</li>
<li>New FIAT conversions for most coins (Thanks to FunkyC: <a href="https://bitcoinindex.es/" rel="external">https://bitcoinindex.es/</a>)</li>
<li>New FIAT conversions for most coins (Thanks to FunkyC: <a href="https://firstrally.com/" rel="external">https://firstrally.com/</a>)</li>
<li>New debug command to see raw miner data: CTRL + D</li>
</ul>
**Recently Added Features:**
@@ -9,15 +9,15 @@
session_write_close();
$CACHED = true;
if (isset($_GET['cached']) && $_GET['cached'] == 0) {
if (isset($_GET['cached']) && ($_GET['cached'] == 'false' || $_GET['cached'] == 0)) {
$CACHED = false;
}
$GLOBALS['cached'] = $CACHED;
$type = (!empty($_GET['type']) ? $_GET['type'] : $_POST['type']);
$action = (!empty($_GET['action']) ? $_GET['action'] : $_POST['action']);
$type = ucwords(strtolower($type));
$type = str_replace(' ', '', lcfirst(ucwords(str_replace('-', ' ', strtolower($type)))));
$action = str_replace(' ', '', lcfirst(ucwords(str_replace('-', ' ', strtolower($action)))));
// If we're not posting, it's a get function
@@ -32,7 +32,7 @@ body {
::-webkit-scrollbar-track { background-color: #999;}
::-webkit-scrollbar-track-piece { background-color: #000;}
::-webkit-scrollbar-thumb { height: 50px; background-color: #666; border-radius: 3px;}
::-webkit-scrollbar-corner { background-color: #999;}}
::-webkit-scrollbar-corner { background-color: #999;}
::-webkit-resizer { background-color: #666;}

@-moz-document url-prefix(http://),url-prefix(https://) {
@@ -74,8 +74,7 @@ h1, h2, h3, h4, h5, h6 {
#settings-wrap h3, #rigPoolDetails h3 {
text-align: center;
font-size: 1.6em;
margin: 30px 0 20px;
padding-top: 20px;
margin: 20px 0;
border-top: 1px solid #888;
box-shadow: 0px -20px 20px -10px rgba(0,0,0, 0.4);
}
@@ -359,6 +358,7 @@ table.table-wallet a, table.table-wallet a:visited, table.table-wallet a:hover {
}

.help-block {
clear: both;
font-weight: bold;
font-family: roboto;
font-style: italic;
@@ -525,7 +525,7 @@ table.table-wallet a, table.table-wallet a:visited, table.table-wallet a:hover {
}

.new-panel-choices a:active i {
text-shadow: ` -1px 0 #777;
text-shadow: -1px 0 #777;
}

.modal-footer {
@@ -660,7 +660,8 @@ select.form-control {
font-family: robotoblack;
}

#panel-login #login-failure {
/*#panel-login */
#login-failure {
border: 1px dashed #d00;
border-width: 2px 0;
color: #fdd;
@@ -674,17 +675,17 @@ select.form-control {
padding: 5px 15px 10px;
}

#panel-login #login-failure p {
#login-failure p {
margin: 0;
line-height: 20px;
padding-bottom: 4px;
}

#panel-login #login-failure p big {
#login-failure p big {
font-size: 140%;
}

#panel-login #login-failure p i {
#login-failure p i {
top: 5px;
right: 0;
font-size: 28px;
@@ -1378,9 +1379,6 @@ a#dash-add-panel.flash {
filter: none;
}

.panel ul.nav-pills li a.pill-danger {
}

.panel ul.nav-pills li i {
margin: 0 0 0 9px;
}
@@ -1391,6 +1389,9 @@ a#dash-add-panel.flash {
text-align: center;
clear: both;
}
.panel-offline .panel-body {
padding: 0px;
}

.full-content .panel-body {
font-size: 18px;
@@ -1656,7 +1657,7 @@ a#dash-add-panel.flash {

.social-box {
text-align: center;
padding: 6px 0;
padding: 10px 0;
}

.social-box .btn {
@@ -1679,7 +1680,7 @@ a#dash-add-panel.flash {
}

.panel-in-footer .btn {
margin: 5px 0;
margin: 4px 0 12px;
}

.panel-in-footer .panel-body .stat-pair {
@@ -1718,9 +1719,6 @@ a#dash-add-panel.flash {
width: auto;
}

.panel-in-footer .panel-body .stat-pair-qr .stat-value {
}

.panel-in-footer .panel-body .stat-pair-qr .stat-value img {
height: 64px;
width: 64px;
@@ -1786,7 +1784,7 @@ a#dash-add-panel.flash {
.table-responsive {
margin-bottom: 0;
overflow-x: auto;
-webkit-overflow-scrolling: touch; // momentum scrolling
-webkit-overflow-scrolling: touch;
}

.panel-body .table-summary {
@@ -1949,7 +1947,7 @@ a#dash-add-panel.flash {
100% {opacity:0;}
}

@-ms-keyframes flash {
@keyframes flash {
0% {opacity:0;}
25% {opacity:1;}
75% {opacity:1;}
@@ -2353,7 +2351,7 @@ a#dash-add-panel.flash {
}

.panel-in-footer .panel-body .stat-pair-qr .stat-label {
min-height: 82px;
min-height: 48px;
}

.panel-body .stat-pair.feed-item .stat-value {
Binary file not shown.
Binary file not shown.
@@ -10,7 +10,7 @@ class Config_Abstract {
protected $_data;
// Objects
protected $_objs;
private $_objs;
public function __construct() {
$this->_fileHandler = new FileHandler($this->_config);
@@ -33,16 +33,38 @@ public function create() {
$url = rtrim($_POST['url'], '/');
$address = $_POST['address'];
$api = $_POST['api'];
$secret = $_POST['secret'];
$coin = $_POST['coin'];
$userid = $_POST['userid'];
$pool = array();
if ($type == 'btcguild' && !empty($api)) {
if ($type == 'antpool' && !empty($api) && !empty($secret) && !empty($userid)) {
$pool = array(
'type' => $type,
'name' => ($label ? $label : 'AntPool'),
'apikey' => $api,
'apisecret' => $secret,
'userid' => $userid,
);
} else if ($type == 'bitminter' && !empty($api) && !empty($userid)) {
$pool = array(
'type' => $type,
'name' => ($label ? $label : 'BitMinter'),
'apikey' => $api,
'userid' => $userid,
);
} else if ($type == 'btcguild' && !empty($api)) {
$pool = array(
'type' => $type,
'name' => ($label ? $label : 'BTC Guild'),
'apikey' => $api,
);
} else if ($type == 'burstninja' && !empty($userid)) {
$pool = array(
'type' => $type,
'name' => ($label ? $label : 'Burst.Ninja'),
'userid' => $userid,
);
} else if ($type == 'eclipse' && !empty($api)) {
$pool = array(
'type' => $type,
@@ -60,7 +82,7 @@ public function create() {
} else if ($type == 'bitcoinaffiliatenetwork' && !empty($api) && !empty($userid)) {
$pool = array(
'type' => $type,
'name' => ($label ? $label : preg_replace('#^https?://#', '', $url)),
'name' => ($label ? $label : 'Bitcoin Affiliate Network'),
'apikey' => $api,
'userid' => $userid,
);
@@ -109,14 +131,41 @@ public function create() {
'name' => ($label ? $label : 'MultiPool.us'),
'apikey' => $api,
);
} else if ($type == 'nomp' && !empty($address) && !empty($url) && !empty($coin)) {
} else if ($type == 'nomp' && !empty($address) && !empty($url)) {
$pool = array(
'type' => $type,
'name' => ($label ? $label : preg_replace('#^https?://#', '', $url)),
'apiurl' => rtrim($url, '/'),
'address' => $address,
'coin' => $coin,
);
} else if ($type == 'p2pool' && !empty($address) && !empty($url)) {
$pool = array(
'type' => $type,
'name' => ($label ? $label : 'MagicPool'),
'apiurl' => rtrim($url, '/'),
'address' => $address,
);
} else if ($type == 'nicehash' && !empty($address)) {
$pool = array(
'type' => $type,
'name' => ($label ? $label : 'NiceHash'),
'apiurl' => 'https://www.nicehash.com',
'address' => $address,
);
} else if ($type == 'westhash' && !empty($address)) {
$pool = array(
'type' => $type,
'name' => ($label ? $label : 'WestHash'),
'apiurl' => 'https://www.westhash.com',
'address' => $address,
);
} else if ($type == 'slush' && !empty($api)) {
$pool = array(
'type' => $type,
'name' => ($label ? $label : 'mining.bitcoin.cz'),
'apikey' => $api,
);
} else {
header("HTTP/1.0 406 Not Acceptable"); // not accepted
return 'All fields are required on this form.';

0 comments on commit 26f0793

Please sign in to comment.
You can’t perform that action at this time.