GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-08 22:08:02 +00:00
Code Issues Releases Wiki Activity

miner.php - define a default rigport (that can be changed) and don't require a port number in the rigs array

Browse Source
This commit is contained in:
Kano 2014-02-11 09:47:51 +11:00 committed by Noel Maersk
parent e3e5d68b92
commit 4511014d6e
2 changed files with 46 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/API
View File

@ -1270,16 +1270,24 @@ However, if $readonly is true, it will not display them
---------
Default:
$rigport = 4028;
Default port to use if any $rigs entries don't specify the port number
---------
Default:
$rigs = array('127.0.0.1:4028');
Set $rigs to an array of your sgminer rigs that are running
format: 'IP:Port' or 'Host:Port' or 'Host:Port:Name'
Set $rigs to an array of your rigs that are running
format: 'IP' or 'Host' or 'IP:Port' or 'Host:Port' or 'Host:Port:Name'
If you only have one rig, it will just show the detail of that rig
If you have more than one rig it will show a summary of all the rigs
with buttons to show the details of each rig -
the button contents will be 'Name' rather than rig number, if you
specify 'Name'
If Port is missing or blank, it will try $rigport
e.g. $rigs = array('127.0.0.1:4028','myrig.com:4028:Sugoi');
---------

41
miner.php
View File

@ -1,8 +1,8 @@
<?php
session_start();
#
global $doctype, $title, $miner, $port, $readonly, $notify, $rigs;
global $rignames, $rigbuttons;
global $doctype, $title, $miner, $port, $readonly, $notify;
global $rigport, $rigs, $rignames, $rigbuttons;
global $mcast, $mcastexpect, $mcastaddr, $mcastport, $mcastcode;
global $mcastlistport, $mcasttimeout, $mcastretries, $allowgen;
global $rigipsecurity, $rigtotals, $forcerigtotals;
@ -45,8 +45,11 @@ $checklastshare = true;
# N.B. also if $readonly is true, it will not display the fields
$poolinputs = false;
#
# Set $rigs to an array of your sgminer rigs that are running
# format: 'IP:Port' or 'Host:Port' or 'Host:Port:Name'
# Default port to use if any $rigs entries don't specify the port number
$rigport = 4028;
#
# Set $rigs to an array of your rigs that are running
# format: 'IP' or 'Host' or 'IP:Port' or 'Host:Port' or 'Host:Port:Name'
$rigs = array('127.0.0.1:4028');
#
# Set $rignames to false, or one of 'ip' or 'ipx'
@ -510,9 +513,12 @@ function getrigs()
#
function getsock($rig, $addr, $port)
{
global $rigips, $rignames, $rigipsecurity;
global $rigport, $rigips, $rignames, $rigipsecurity;
global $haderror, $error, $socksndtimeoutsec, $sockrcvtimeoutsec;
$port = trim($port);
if (strlen($port) == 0)
$port = $rigport;
$error = null;
$socket = null;
$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
@ -1679,10 +1685,13 @@ function doforeach($cmd, $des, $sum, $head, $datetime)
continue;
$parts = explode(':', $rig, 3);
if (count($parts) >= 2)
if (count($parts) >= 1)
{
$miner = $parts[0];
if (count($parts) >= 2)
$port = $parts[1];
else
$port = '';
if (count($parts) > 2)
$name = $parts[2];
@ -2589,10 +2598,13 @@ function processcustompage($pagename, $sections, $sum, $ext, $namemap)
foreach ($rigs as $num => $rig)
{
$parts = explode(':', $rig, 3);
if (count($parts) >= 2)
if (count($parts) >= 1)
{
$miner = $parts[0];
if (count($parts) >= 2)
$port = $parts[1];
else
$port = '';
if (count($parts) > 2)
$name = $parts[2];
@ -2950,10 +2962,13 @@ function display()
if ($rig != null and $rig != '' and $rig >= 0 and $rig < count($rigs))
{
$parts = explode(':', $rigs[$rig], 3);
if (count($parts) >= 2)
if (count($parts) >= 1)
{
$miner = $parts[0];
if (count($parts) >= 2)
$port = $parts[1];
else
$port = '';
if ($readonly !== true)
$preprocess = $arg;
@ -3002,10 +3017,13 @@ function display()
if (count($rigs) == 1)
{
$parts = explode(':', $rigs[0], 3);
if (count($parts) >= 2)
if (count($parts) >= 1)
{
$miner = $parts[0];
if (count($parts) >= 2)
$port = $parts[1];
else
$port = '';
htmlhead($mcerr, true, 0);
doOne(0, $preprocess);
@ -3022,10 +3040,13 @@ function display()
if ($rig != null and $rig != '' and $rig >= 0 and $rig < count($rigs))
{
$parts = explode(':', $rigs[$rig], 3);
if (count($parts) >= 2)
if (count($parts) >= 1)
{
$miner = $parts[0];
if (count($parts) >= 2)
$port = $parts[1];
else
$port = '';
htmlhead($mcerr, true, 0);
doOne($rig, $preprocess);