[CLEANUP] Admin Checks formatting and better exit message
This commit is contained in:
parent
7a31e3c35b
commit
6159123551
@ -105,20 +105,15 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][
|
|||||||
|
|
||||||
$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
|
$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
|
||||||
|
|
||||||
socket_set_nonblock($socket)
|
socket_set_nonblock($socket)
|
||||||
or exit;
|
or die('Failed to set socket to non-blocking');
|
||||||
|
|
||||||
$time = time();
|
$time = time();
|
||||||
while (!@socket_connect($socket, $host, $port))
|
while (!@socket_connect($socket, $host, $port)) {
|
||||||
{
|
|
||||||
$err = socket_last_error($socket);
|
$err = socket_last_error($socket);
|
||||||
if ($err == 115 || $err == 114)
|
if ($err == 115 || $err == 114) {
|
||||||
{
|
if ((time() - $time) >= $timeout) {
|
||||||
if ((time() - $time) >= $timeout)
|
|
||||||
{
|
|
||||||
socket_close($socket);
|
socket_close($socket);
|
||||||
//die("Connection timed out.\n");
|
|
||||||
//$enotice[] = 'We tried to poke your Stratum server using your $config[\'gettingstarted\'] settings but it didn\'t respond';
|
|
||||||
$stratumerror = true;
|
$stratumerror = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -128,12 +123,11 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][
|
|||||||
$stratumerrormessage = socket_strerror($err);
|
$stratumerrormessage = socket_strerror($err);
|
||||||
}
|
}
|
||||||
if ($stratumerror) {
|
if ($stratumerror) {
|
||||||
$enotice[] = 'We tried to poke your Stratum server using your $config[\'gettingstarted\'] settings but it didn\'t respond - ' . $stratumerrormessage;
|
$enotice[] = 'We tried to poke your Stratum server using your $config[\'gettingstarted\'] settings but it didn\'t respond - ' . $stratumerrormessage;
|
||||||
} else {
|
} else {
|
||||||
socket_set_block($socket)
|
socket_set_block($socket)
|
||||||
or exit;
|
or die('Failed to set socket to blocking');
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// Connect via fsockopen as fallback
|
// Connect via fsockopen as fallback
|
||||||
if (! $fp = @fsockopen($config['gettingstarted']['stratumurl'], $config['gettingstarted']['stratumport'], $errCode, $errStr, 1)) {
|
if (! $fp = @fsockopen($config['gettingstarted']['stratumurl'], $config['gettingstarted']['stratumport'], $errCode, $errStr, 1)) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user