miner.php allow links for rig buttons in tables and allow using the 4th IP octet if no rig name - default disabled for both
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244
diff --git a/API-README b/API-README
index 88b29a2..1211f53 100644
--- a/API-README
+++ b/API-README
@@ -1234,6 +1234,27 @@ e.g. $rigs = array('127.0.0.1:4028','myrig.com:4028:Sugoi');
---------
Default:
+ $rignames = false;
+
+Set $rignames to false to not affect the display.
+Set $rignames to one of 'ip' or 'ipx' to alter the name displayed
+if the rig doesn't have a 'name' in $rigs
+Currently:
+ 'ip' means use the 4th byte of the rig IP address as an integer
+ 'ipx' means use the 4th byte of the rig IP address as 2 hex bytes
+
+---------
+
+Default:
+ $rigbuttons = true;
+
+Set $rigbuttons to false to display a link rather than a button on
+the left of any summary table with rig buttons, in order to reduce
+the height of the table cells
+
+---------
+
+Default:
$mcast = false;
Set $mcast to true to look for your rigs and ignore $rigs
diff --git a/miner.php b/miner.php
index ff2e457..1de3951 100644
--- a/miner.php
+++ b/miner.php
@@ -2,6 +2,7 @@
session_start();
#
global $doctype, $title, $miner, $port, $readonly, $notify, $rigs;
+global $rignames, $rigbuttons;
global $mcast, $mcastexpect, $mcastaddr, $mcastport, $mcastcode;
global $mcastlistport, $mcasttimeout, $mcastretries, $allowgen;
global $rigipsecurity, $rigtotals, $forcerigtotals;
@@ -48,6 +49,13 @@ $poolinputs = false;
# format: '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'
+# this says what to use if $rigs doesn't have a 'name'
+$rignames = false;
+#
+# Set $rigbuttons to false to display a link rather than a button
+$rigbuttons = true;
+#
# Set $mcast to true to look for your rigs and ignore $rigs
$mcast = false;
#
@@ -247,6 +255,9 @@ $colourtable = array(
$miner = null;
$port = null;
#
+global $rigips;
+$rigips = array();
+#
# Ensure it is only ever shown once
global $showndate;
$showndate = false;
@@ -289,6 +300,14 @@ function getdom($domname)
return getcss($domname, true);
}
#
+# N.B. don't call this before calling htmlhead()
+function php_pr($cmd)
+{
+ global $here, $autorefresh;
+
+ return "$here?ref=$autorefresh$cmd";
+}
+#
function htmlhead($mcerr, $checkapi, $rig, $pg = null, $noscript = false)
{
global $doctype, $title, $miner_font_family, $miner_font_size;
@@ -491,7 +510,7 @@ function getrigs()
#
function getsock($rig, $addr, $port)
{
- global $rigipsecurity;
+ global $rigips, $rignames, $rigipsecurity;
global $haderror, $error, $socksndtimeoutsec, $sockrcvtimeoutsec;
$error = null;
@@ -534,6 +553,9 @@ function getsock($rig, $addr, $port)
socket_close($socket);
return null;
}
+ if ($rignames !== false && !isset($rigips[$addr]))
+ if (socket_getpeername($socket, $ip) == true)
+ $rigips[$addr] = $ip;
return $socket;
}
#
@@ -1536,39 +1558,67 @@ function process($cmds, $rig)
#
function rigname($rig, $rigname)
{
- global $rigs;
+ global $rigs, $rignames, $rigips;
if (isset($rigs[$rig]))
{
$parts = explode(':', $rigs[$rig], 3);
if (count($parts) == 3)
$rigname = $parts[2];
+ else
+ if ($rignames !== false)
+ {
+ switch ($rignames)
+ {
+ case 'ip':
+ if (isset($parts[0]) && isset($rigips[$parts[0]]))
+ {
+ $ip = explode('.', $rigips[$parts[0]]);
+ if (count($ip) == 4)
+ $rigname = intval($ip[3]);
+ }
+ break;
+ case 'ipx':
+ if (isset($parts[0]) && isset($rigips[$parts[0]]))
+ {
+ $ip = explode('.', $rigips[$parts[0]]);
+ if (count($ip) == 4)
+ $rigname = intval($ip[3], 16);
+ }
+ break;
+ }
+ }
}
return $rigname;
}
#
-function riginput($rig, $rigname)
+function riginput($rig, $rigname, $usebuttons)
{
$rigname = rigname($rig, $rigname);
- return "<input type=button value='$rigname' onclick='pr(\"&rig=$rig\",null)'>";
+ if ($usebuttons === true)
+ return "<input type=button value='$rigname' onclick='pr(\"&rig=$rig\",null)'>";
+ else
+ return "<a href='".php_pr("&rig=$rig")."'>$rigname</a>";
}
#
-function rigbutton($rig, $rigname, $when, $row)
+function rigbutton($rig, $rigname, $when, $row, $usebuttons)
{
list($value, $class) = fmt('BUTTON', 'Rig', '', $when, $row);
if ($rig === '')
$ri = ' ';
else
- $ri = riginput($rig, $rigname);
+ $ri = riginput($rig, $rigname, $usebuttons);
return "<td align=middle$class>$ri</td>";
}
#
function showrigs($anss, $headname, $rigname)
{
+ global $rigbuttons;
+
$dthead = array($headname => 1, 'STATUS' => 1, 'Description' => 1, 'When' => 1, 'API' => 1, 'CGMiner' => 1);
showhead('', $dthead);
@@ -1591,7 +1641,7 @@ function showrigs($anss, $headname, $rigname)
foreach ($dthead as $name => $x)
{
if ($item == 'STATUS' && $name == $headname)
- echo rigbutton($rig, $rigname.$rig, $when, null);
+ echo rigbutton($rig, $rigname.$rig, $when, null, $rigbuttons);
else
{
if (isset($row[$name]))
@@ -1610,7 +1660,7 @@ function showrigs($anss, $headname, $rigname)
function doforeach($cmd, $des, $sum, $head, $datetime)
{
global $miner, $port;
- global $error, $readonly, $notify, $rigs;
+ global $error, $readonly, $notify, $rigs, $rigbuttons;
global $warnfont, $warnoff, $dfmt;
global $rigerror;
@@ -1747,7 +1797,7 @@ function doforeach($cmd, $des, $sum, $head, $datetime)
echo "<td align=right$class>Total:</td>";
}
else
- echo rigbutton($rig, "Rig $rig", $when, $row);
+ echo rigbutton($rig, "Rig $rig", $when, $row, $rigbuttons);
}
else
{
@@ -1780,7 +1830,7 @@ function refreshbuttons()
#
function pagebuttons($rig, $pg)
{
- global $readonly, $rigs, $userlist, $ses;
+ global $readonly, $rigs, $rigbuttons, $userlist, $ses;
global $allowcustompages, $customsummarypages;
if ($rig === null)
@@ -1819,10 +1869,12 @@ function pagebuttons($rig, $pg)
if ($userlist === null || isset($_SESSION[$ses]))
{
if ($prev !== null)
- echo riginput($prev, 'Prev').' ';
+ echo riginput($prev, 'Prev', true).' ';
+
echo "<input type=button value='Refresh' onclick='pr(\"$refresh\",null)'> ";
+
if ($next !== null)
- echo riginput($next, 'Next').' ';
+ echo riginput($next, 'Next', true).' ';
echo ' ';
if (count($rigs) > 1)
echo "<input type=button value='Summary' onclick='pr(\"\",null)'> ";
@@ -2184,6 +2236,8 @@ function secmatch($section, $field)
#
function customset($showfields, $sum, $section, $rig, $isbutton, $result, $total)
{
+ global $rigbuttons;
+
foreach ($result as $sec => $row)
{
$secname = preg_replace('/\d/', '', $sec);
@@ -2200,7 +2254,7 @@ function customset($showfields, $sum, $section, $rig, $isbutton, $result, $total
if ($isbutton)
- echo rigbutton($rig, $rig, $when, $row);
+ echo rigbutton($rig, $rig, $when, $row, $rigbuttons);
else
{
list($ignore, $class) = fmt('total', '', '', $when, $row);