Commit b90e059ce76de51f5d3015184dc0a29162d75ad0
2013-08-31T19:26:56
Merge pull request #488 from kanoi/master miner.php $mcastexpect, font adjustements and doctype
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 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312
diff --git a/API-README b/API-README
index ef61c81..2d7110c 100644
--- a/API-README
+++ b/API-README
@@ -952,7 +952,9 @@ or in your cgminer.conf
And in miner.php set $mcast = true;
This will ignore the value of $rigs and overwrite it with the list of zero or
-more rigs found on the network in the timout specified
+more rigs found on the network in the timeout specified
+A rig will not reply if the API settings would mean it would also ignore an
+API request from the web server running miner.php
---------
@@ -1197,6 +1199,14 @@ Set $mcast to true to look for your rigs and ignore $rigs
---------
Default:
+ $mcastexpect = 0;
+
+The minimum number of rigs expected to be found when $mcast is true
+If fewer are found, an error will be included at the top of the page
+
+---------
+
+Default:
$mcastaddr = '224.0.0.75';
API Multicast address all cgminers are listening on
diff --git a/miner.php b/miner.php
index 137db7e..89f3cba 100644
--- a/miner.php
+++ b/miner.php
@@ -1,8 +1,8 @@
<?php
session_start();
#
-global $title, $miner, $port, $readonly, $notify, $rigs;
-global $mcast, $mcastaddr, $mcastport, $mcastcode;
+global $doctype, $title, $miner, $port, $readonly, $notify, $rigs;
+global $mcast, $mcastexpect, $mcastaddr, $mcastport, $mcastcode;
global $mcastlistport, $mcasttimeout;
global $rigipsecurity, $rigtotals, $forcerigtotals;
global $socksndtimeoutsec, $sockrcvtimeoutsec;
@@ -10,8 +10,11 @@ global $checklastshare, $poolinputs, $hidefields;
global $ignorerefresh, $changerefresh, $autorefresh;
global $allowcustompages, $customsummarypages;
global $miner_font_family, $miner_font_size;
+global $bad_font_family, $bad_font_size;
global $colouroverride, $placebuttons, $userlist;
#
+$doctype = "<!DOCTYPE html>\n";
+#
# See API-README for more details of these variables and how
# to configure miner.php
#
@@ -48,6 +51,9 @@ $rigs = array('127.0.0.1:4028');
# Set $mcast to true to look for your rigs and ignore $rigs
$mcast = false;
#
+# Set $mcastexpect to at least how many rigs you expect it to find
+$mcastexpect = 0;
+#
# API Multicast address all cgminers are listening on
$mcastaddr = '224.0.0.75';
#
@@ -176,9 +182,12 @@ $warnfont = '<font color=red><b>';
$warnoff = '</b></font>';
$dfmt = 'H:i:s j-M-Y \U\T\CP';
#
-$miner_font_family = 'verdana,arial,sans';
+$miner_font_family = 'Verdana, Arial, sans-serif, sans';
$miner_font_size = '13pt';
#
+$bad_font_family = '"Times New Roman", Times, serif';
+$bad_font_size = '18pt';
+#
# Edit this or redefine it in myminer.php to change the colour scheme
# See $colourtable below for the list of names
$colouroverride = array();
@@ -198,7 +207,7 @@ if (file_exists('myminer.php'))
# This is the system default that must always contain all necessary
# colours so it must be a constant
# You can override these values with $colouroverride
-# The only one missing is in $warnfont
+# The only one missing is $warnfont
# - which you can override directly anyway
global $colourtable;
$colourtable = array(
@@ -210,6 +219,8 @@ $colourtable = array(
'td.h background' => '#c4ffff',
'td.err color' => 'black',
'td.err background' => '#ff3050',
+ 'td.bad color' => 'black',
+ 'td.bad background' => '#ff3050',
'td.warn color' => 'black',
'td.warn background' => '#ffb050',
'td.sta color' => 'green',
@@ -269,9 +280,10 @@ function getdom($domname)
return getcss($domname, true);
}
#
-function htmlhead($checkapi, $rig, $pg = null, $noscript = false)
+function htmlhead($mcerr, $checkapi, $rig, $pg = null, $noscript = false)
{
- global $title, $miner_font_family, $miner_font_size;
+ global $doctype, $title, $miner_font_family, $miner_font_size;
+ global $bad_font_family, $bad_font_size;
global $error, $readonly, $poolinputs, $here;
global $ignorerefresh, $autorefresh;
@@ -300,14 +312,16 @@ function htmlhead($checkapi, $rig, $pg = null, $noscript = false)
$readonly = true;
}
$miner_font = "font-family:$miner_font_family; font-size:$miner_font_size;";
+ $bad_font = "font-family:$bad_font_family; font-size:$bad_font_size;";
- echo "<html><head>$refreshmeta
+ echo "$doctype<html><head>$refreshmeta
<title>$title</title>
<style type='text/css'>
td { $miner_font ".getcss('td')."}
td.two { $miner_font ".getcss('td.two')."}
td.h { $miner_font ".getcss('td.h')."}
td.err { $miner_font ".getcss('td.err')."}
+td.bad { $bad_font ".getcss('td.bad')."}
td.warn { $miner_font ".getcss('td.warn')."}
td.sta { $miner_font ".getcss('td.sta')."}
td.tot { $miner_font ".getcss('td.tot')."}
@@ -339,6 +353,14 @@ echo "</script>\n";
<tr><td align=center valign=top>
<table border=0 cellpadding=4 cellspacing=0 summary='Mine'>
<?php
+ echo $mcerr;
+}
+#
+function minhead($mcerr = '')
+{
+ global $readonly;
+ $readonly = true;
+ htmlhead($mcerr, false, null, null, true);
}
#
global $haderror, $error;
@@ -643,9 +665,14 @@ function newrow()
echo '<tr>';
}
#
+function othrow($row)
+{
+ return "<tr>$row</tr>";
+}
+#
function otherrow($row)
{
- echo "<tr>$row</tr>";
+ echo othrow($row);
}
#
function endrow()
@@ -1810,8 +1837,6 @@ function doOne($rig, $preprocess)
global $haderror, $readonly, $notify, $rigs;
global $placebuttons;
- htmlhead(true, $rig);
-
if ($placebuttons == 'top' || $placebuttons == 'both')
pagebuttons($rig, null);
@@ -2451,6 +2476,8 @@ function processcustompage($pagename, $sections, $sum, $ext, $namemap)
$results[$cmd][$num] = $process;
}
}
+ else
+ otherrow('<td class=bad>Bad "$rigs" array</td>');
}
$shownsomething = false;
@@ -2566,21 +2593,19 @@ function showcustompage($pagename)
global $customsummarypages;
global $placebuttons;
- htmlhead(false, null, $pagename);
-
if ($placebuttons == 'top' || $placebuttons == 'both')
pagebuttons(null, $pagename);
if (!isset($customsummarypages[$pagename]))
{
- otherrow("<td colspan=100>Unknown custom summary page '$pagename'</td>");
+ otherrow("<td colspan=100 class=bad>Unknown custom summary page '$pagename'</td>");
return;
}
$c = count($customsummarypages[$pagename]);
if ($c < 2 || $c > 3)
{
- $rw = "<td colspan=100>Invalid custom summary page '$pagename' (";
+ $rw = "<td colspan=100 class=bad>Invalid custom summary page '$pagename' (";
$rw .= count($customsummarypages[$pagename]).')</td>';
otherrow($rw);
return;
@@ -2625,7 +2650,7 @@ function showcustompage($pagename)
if (count($page) <= 1)
{
- otherrow("<td colspan=100>Invalid custom summary page '$pagename' no content </td>");
+ otherrow("<td colspan=100 class=bad>Invalid custom summary page '$pagename' no content </td>");
return;
}
@@ -2639,7 +2664,7 @@ function onlylogin()
{
global $here;
- htmlhead(false, null, null, true);
+ htmlhead('', false, null, null, true);
?>
<tr height=15%><td> </td></tr>
@@ -2739,6 +2764,7 @@ function checklogin()
function display()
{
global $miner, $port;
+ global $mcast, $mcastexpect;
global $readonly, $notify, $rigs;
global $ignorerefresh, $autorefresh;
global $allowcustompages, $customsummarypages;
@@ -2750,11 +2776,24 @@ function display()
if ($pagesonly === 'login')
return;
+ $mcerr = '';
+
if ($rigs == null or count($rigs) == 0)
{
- otherrow("<td>No rigs defined</td>");
+ if ($mcast === true)
+ $action = 'found';
+ else
+ $action = 'defined';
+
+ minhead();
+ otherrow("<td class=bad>No rigs $action</td>");
return;
}
+ else
+ {
+ if ($mcast === true && count($rigs) < $mcastexpect)
+ $mcerr = othrow('<td class=bad>Found '.count($rigs)." rigs but expected at least $mcastexpect</td>");
+ }
if ($ignorerefresh == false)
{
@@ -2811,7 +2850,8 @@ function display()
if ($pg !== null && $pg !== '')
{
- showcustompage($pg);
+ htmlhead($mcerr, false, null, $pg);
+ showcustompage($pg, $mcerr);
return;
}
}
@@ -2830,10 +2870,14 @@ function display()
$miner = $parts[0];
$port = $parts[1];
+ htmlhead($mcerr, true, 0);
doOne(0, $preprocess);
}
else
- otherrow('<td>Invalid "$rigs" array</td>');
+ {
+ minhead($mcerr);
+ otherrow('<td class=bad>Invalid "$rigs" array</td>');
+ }
return;
}
@@ -2846,15 +2890,19 @@ function display()
$miner = $parts[0];
$port = $parts[1];
+ htmlhead($mcerr, true, 0);
doOne($rig, $preprocess);
}
else
- otherrow('<td>Invalid "$rigs" array</td>');
+ {
+ minhead($mcerr);
+ otherrow('<td class=bad>Invalid "$rigs" array</td>');
+ }
return;
}
- htmlhead(false, null);
+ htmlhead($mcerr, false, null);
if ($placebuttons == 'top' || $placebuttons == 'both')
pagebuttons(null, null);
@@ -2880,7 +2928,7 @@ function display()
pagebuttons(null, null);
}
#
-if (isset($mcast) && $mcast === true)
+if ($mcast === true)
getrigs();
display();
#