Skip to content

Commit 0b91d74

Browse files
xisixisi
committed
Updated issue #2427
1 parent 02067ac commit 0b91d74

File tree

7 files changed

+55
-8
lines changed

7 files changed

+55
-8
lines changed

‎include/pages/admin/checks/check_daemon.inc.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
if ($bitcoin->can_connect() !== true) {
77
$newerror = array();
88
$newerror['name'] = "Coin daemon";
9+
$newerror['level'] = 3;
910
$newerror['description'] = "Unable to connect to coin daemon using provided credentials.";
1011
$newerror['configvalue'] = "wallet.*";
12+
$newerror['extdesc'] = "We weren't able to connect to your coin daemon using the host/username/password/port given in the config. Check that your coin daemon is running and mpos is configured with the data from your coin daemon config.";
1113
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-local-wallet-rpc";
1214
$error[] = $newerror;
1315
$newerror = null;
@@ -17,6 +19,8 @@
1719
if ($bitcoin->is_testnet() == true) {
1820
$newerror = array();
1921
$newerror['name'] = "Coin daemon";
22+
$newerror['level'] = 3;
23+
$newerror['extdesc'] = "You may have accidentally mistyped the port, or are running the coin daemon in testnet mode. Check your coin daemon config and MPOS config.";
2024
$newerror['description'] = "The coin daemon service is running as a testnet. Check the TESTNET setting in your coin daemon config and make sure the correct port is set in the MPOS config.";
2125
$newerror['configvalue'] = "wallet.host";
2226
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-local-wallet-rpc";
@@ -28,11 +32,13 @@
2832
if (count($accounts) > 1 && $accounts[''] <= 0) {
2933
$newerror = array();
3034
$newerror['name'] = "Coin daemon";
35+
$newerror['level'] = 3;
36+
$newerror['extdesc'] = "You need at least one account to be able to pay miners! See the above link for more details.";
3137
$newerror['description'] = "There are " . count($accounts) . " Accounts set in local Wallet and Default Account has no liquid funds to pay your miners!";
3238
$newerror['configvalue'] = "wallet.host";
3339
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-local-wallet-rpc";
3440
$error[] = $newerror;
3541
$newerror = null;
3642
}
37-
}
43+
}
3844
} catch (Exception $e) {}

‎include/pages/admin/checks/check_fees.inc.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
if ($config['fees'] == 0 && ($config['txfee_auto'] == 0 || $config['txfee_manual'] == 0)) {
66
$newerror = array();
77
$newerror['name'] = "Fees and TX Fees 0";
8+
$newerror['level'] = 2;
9+
$newerror['extdesc'] = "This is an issue that can only occur with both your fees set to 0 and auto or manual tx fees set to 0 as well. It's best to avoid it if possible though, as it can prevent payouts; set the txfee to a small amount to avoid this.";
810
$newerror['description'] = "Having your pool fees set to 0 and tx fees also set to 0 can cause a problem where the wallet cannot payout, consider setting the txfee to a very low amount, ie. 0.0001 to avoid this.";
911
$newerror['configvalue'] = "fees";
1012
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/issues/2424";

‎include/pages/admin/checks/check_memcache.inc.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
if (!class_exists('Memcached') && $config['memcache']['enabled']) {
66
$newerror = array();
77
$newerror['name'] = "Memcache Config";
8+
$newerror['level'] = 3;
9+
$newerror['extdesc'] = "Memcache is a service that you run that lets us cache commonly used data and access it quickly. It's highly recommended you <a href='https://github.com/MPOS/php-mpos/wiki/Quick-Start-Guide#requirements-1'>install the service and php packages</a> for your distro.";
810
$newerror['description'] = "You have memcached enabled in your config and it's not available as a PHP module. Install the package on your system.";
911
$newerror['configvalue'] = "memcache.enabled";
1012
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-memcache";
@@ -31,6 +33,8 @@
3133
if (class_exists('Memcached') && $memcache_test_get == $randmctv) {
3234
$newerror = array();
3335
$newerror['name'] = "Memcache Config";
36+
$newerror['level'] = 2;
37+
$newerror['extdesc'] = "Memcache is a service that you run that lets us cache commonly used data and access it quickly. It's highly recommended you <a href='https://github.com/MPOS/php-mpos/wiki/Quick-Start-Guide#requirements-1'>install the service and php packages</a> for your distro.";
3438
$newerror['description'] = "You have memcache disabled in the config but it's available and works! Enable it for best performance.";
3539
$newerror['configvalue'] = "memcache.enabled";
3640
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-memcache";
@@ -39,6 +43,8 @@
3943
} else {
4044
$newerror = array();
4145
$newerror['name'] = "Memcache Config";
46+
$newerror['level'] = 2;
47+
$newerror['extdesc'] = "Memcache is a service that you run that lets us cache commonly used data and access it quickly. It's highly recommended you <a href='https://github.com/MPOS/php-mpos/wiki/Quick-Start-Guide#requirements-1'>install the service and php packages</a> for your distro.";
4248
$newerror['description'] = "Memcache is disabled; Almost every linux distro has packages for it, you should be using it if you can.";
4349
$newerror['configvalue'] = "memcache.enabled";
4450
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-memcache";
@@ -51,6 +57,8 @@
5157
if ($config['mc_antidos'] && !$config['memcache']['enabled']) {
5258
$newerror = array();
5359
$newerror['name'] = "Memcache Config";
60+
$newerror['level'] = 3;
61+
$newerror['extdesc'] = "Memcache is a service that you run that lets us cache commonly used data and access it quickly. It's highly recommended you <a href='https://github.com/MPOS/php-mpos/wiki/Quick-Start-Guide#requirements-1'>install the service and php packages</a> for your distro.";
5462
$newerror['description'] = "mc_antidos is enabled and memcache is not, <u>memcache is required</u> to use this.";
5563
$newerror['configvalue'] = "memcache.enabled";
5664
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Config-Setup#memcache-rate-limiting";

‎include/pages/admin/checks/check_permissions.inc.php‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
if (!is_writable($config['logging']['path'])) {
77
$newerror = array();
88
$newerror['name'] = "Log path permissions";
9+
$newerror['level'] = 3;
10+
$newerror['extdesc'] = "In order to log data, we need to be able to write in the logs folder. See the link above for more details.";
911
$newerror['description'] = "Logging is enabled but we can't write in the logfile path.";
1012
$newerror['configvalue'] = "logging.path";
1113
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Quick-Start-Guide#configuration-1";
@@ -18,18 +20,22 @@
1820
if (!is_writable(TEMPLATE_DIR . '/cache')) {
1921
$newerror = array();
2022
$newerror['name'] = "templates/cache permissions";
23+
$newerror['level'] = 3;
24+
$newerror['extdesc'] = "In order to cache template data, we need to be able to write in the templates/cache folder. See the link above for more details.";
2125
$newerror['description'] = "templates/cache folder is not writable for uid {$apache_user['name']}";
2226
$newerror['configvalue'] = "templates/cache folder";
23-
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Quick-Start-Guide#configuration-1";
27+
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Quick-Start-Guide#folder-permissions";
2428
$error[] = $newerror;
2529
$newerror = null;
2630
}
2731
if (!is_writable(TEMPLATE_DIR . '/compile')) {
2832
$newerror = array();
2933
$newerror['name'] = "templates/compile permissions";
34+
$newerror['level'] = 3;
35+
$newerror['extdesc'] = "In order to cache compiled template data, we need to be able to write in the templates/compile folder. See the link above for more details.";
3036
$newerror['description'] = "templates/compile folder is not writable for uid {$apache_user['name']}";
3137
$newerror['configvalue'] = "templates/compile folder";
32-
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Quick-Start-Guide#configuration-1";
38+
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Quick-Start-Guide#folder-permissions";
3339
$error[] = $newerror;
3440
$newerror = null;
3541
}
@@ -39,7 +45,9 @@
3945
is_writable(INCLUDE_DIR.'/config/security.inc.php') || is_writable(INCLUDE_DIR.'/config/security.inc.dist.php')) {
4046
$newerror = array();
4147
$newerror['name'] = "Config permissions";
42-
$newerror['description'] = "Your config files <b>SHOULD NOT be writable to this user</b>!";
48+
$newerror['level'] = 2;
49+
$newerror['extdesc'] = "For security purposes, the user your webserver runs as should not be able to write to the config files, only read from them. To fix this, check the ownership and permissions of the include/config files.";
50+
$newerror['description'] = "Your config files <b>SHOULD NOT be writable by this user</b>!";
4351
$newerror['configvalue'] = "global.inc.php and security.inc.php";
4452
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Quick-Start-Guide#configuration-1";
4553
$error[] = $newerror;

‎include/pages/admin/checks/check_security.inc.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
if (strlen($config['SALT']) < 24 || strlen($config['SALTY']) < 24 || $config['SALT'] == 'PLEASEMAKEMESOMETHINGRANDOM' || $config['SALTY'] == 'THISSHOULDALSOBERRAANNDDOOM') {
66
$newerror = array();
77
$newerror['name'] = "Password Salts";
8+
$newerror['level'] = 2;
9+
$newerror['extdesc'] = "Salts are important because they add a random element and 'padding' to passwords and other hashed strings. They should be changed from the default and should not be too short for increased security.";
810
if ($config['SALT'] == 'PLEASEMAKEMESOMETHINGRANDOM' || $config['SALTY'] == 'THISSHOULDALSOBERRAANNDDOOM') {
911
$newerror['description'] = "You absolutely <u>SHOULD NOT leave your SALT or SALTY default</u> changing them will require registering again.";
1012
} else {
@@ -20,6 +22,8 @@
2022
if (!file_exists(BASEPATH.".htaccess")) {
2123
$newerror = array();
2224
$newerror['name'] = ".htaccess";
25+
$newerror['level'] = 2;
26+
$newerror['extdesc'] = ".htaccess files let you control who/how files are accessed for Apache. If you're using Apache for MPOS, you should be using .htaccess.";
2327
$htaccess_link = "<a href='https://github.com/MPOS/php-mpos/blob/next/public/.htaccess'>.htaccess</a>";
2428
$newerror['description'] = "You don't seem to have a .htaccess in your public folder, if you're using Apache set it up: $htaccess_link";
2529
$newerror['configvalue'] = ".htaccess";

‎include/pages/admin/checks/check_stratum.inc.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
} else {
1616
$newerror = array();
1717
$newerror['name'] = "Stratum information";
18+
$newerror['level'] = 1;
19+
$newerror['extdesc'] = "We tried to connect the stratum server that you set in your gettingstarted config, but an error occured somewhere along the way. Your stratum server may not be running currently, your firewall could be blocking the connection, etc.";
1820
$newerror['description'] = "We tried to poke your Stratum server using your \$config['gettingstarted'] settings but it didn't respond - " . socket_strerror(socket_last_error()) . ".";
1921
$newerror['configvalue'] = "gettingstarted";
2022
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-getting-started";
@@ -26,6 +28,8 @@
2628
if (! $fp = @fsockopen($config['gettingstarted']['stratumurl'], $config['gettingstarted']['stratumport'], $errCode, $errStr, 1)) {
2729
$newerror = array();
2830
$newerror['name'] = "Stratum information";
31+
$newerror['level'] = 1;
32+
$newerror['extdesc'] = "We tried to connect the stratum server that you set in your gettingstarted config, but an error occured somewhere along the way. Your stratum server may not be running currently, your firewall could be blocking the connection, etc.";
2933
$newerror['description'] = "We tried to poke your Stratum server using your \$config['gettingstarted'] settings but it didn't respond.";
3034
$newerror['configvalue'] = "gettingstarted";
3135
$newerror['helplink'] = "https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-getting-started";

‎templates/bootstrap/admin/setup/default.tpl‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,25 @@
88
<div class="panel-body">
99
{if $ERRORS|@count > 0}
1010
{section errors $ERRORS}
11-
<p><strong>{$ERRORS[errors].name}</strong></p>
12-
<p>{$ERRORS[errors].description}</p>
13-
<p>See: <a href="{$ERRORS[errors].helplink}">{$ERRORS[errors].configvalue}</a></p>
14-
<hr />
11+
<div class="row">
12+
<div class="col-lg-12">
13+
<div class="panel panel-{if $ERRORS[errors].level >= 2}danger
14+
{elseif $ERRORS[errors].level == 1}warning
15+
{elseif $ERRORS[errors].level == 0}info{/if}">
16+
<div class="panel-heading">
17+
<i class="fa fa-{if $ERRORS[errors].level >= 2}times-circle
18+
{elseif $ERRORS[errors].level == 1}warning
19+
{elseif $ERRORS[errors].level == 0}info{/if} fa-fw"></i> <strong>{$ERRORS[errors].name}</strong>
20+
</div>
21+
<div class="panel-body">
22+
<p>{$ERRORS[errors].description}</p>
23+
<p><pre style='width:35%'>$config.<a href="{$ERRORS[errors].helplink}">{$ERRORS[errors].configvalue}</a></pre></p>
24+
<p>{$ERRORS[errors].extdesc}</p>
25+
</div>
26+
</div>
27+
</div>
28+
<!-- /.col-lg-12 -->
29+
</div>
1530
{/section}
1631
{/if}
1732
</div>

0 commit comments

Comments
 (0)