Merge pull request #216 from kanoi/master miner.php add version numbers to the multi-rig summary page
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
diff --git a/miner.php b/miner.php
index 3372d39..8b38976 100644
--- a/miner.php
+++ b/miner.php
@@ -2,7 +2,7 @@
session_start();
#
global $miner, $port, $readonly, $notify, $rigs, $socktimeoutsec;
-global $checklastshare;
+global $checklastshare, $hidefields;
#
# Don't touch these 2 - see $rigs below
$miner = null;
@@ -40,6 +40,16 @@ $rigs = array('127.0.0.1:4028');
# Also, on some windows PHP, apparently the $usec is ignored
$socktimeoutsec = 10;
#
+# List of fields NOT to be displayed
+# You can use this to hide data you don't want to see or don't want
+# shown on a public web page
+# The list of sections are: SUMMARY, POOL, PGA, GPU, NOTIFY, CONFIG
+# See the web page for the list of field names (the table headers)
+# It is an array of 'SECTION.Field Name' => 1
+# This example would hide the slightly more sensitive pool information
+#$hidefields = array('POOL.URL' => 1, 'POOL.User' => 1);
+$hidefields = array();
+#
$here = $_SERVER['PHP_SELF'];
#
global $tablebegin, $tableend, $warnfont, $warnoff, $dfmt;
@@ -151,7 +161,7 @@ function readsockline($socket)
#
function api($cmd)
{
- global $miner, $port;
+ global $miner, $port, $hidefields;
$socket = getsock($miner, $port);
if ($socket != null)
@@ -186,6 +196,8 @@ function api($cmd)
if (strlen($name) == 0)
$name = 'null';
+ $sectionname = preg_replace('/\d/', '', $name);
+
if (isset($data[$name]))
{
$num = 1;
@@ -198,6 +210,10 @@ function api($cmd)
foreach ($items as $item)
{
$id = explode('=', $item, 2);
+
+ if (isset($hidefields[$sectionname.'.'.$id[0]]))
+ continue;
+
if (count($id) == 2)
$data[$name][$id[0]] = $id[1];
else
@@ -739,7 +755,7 @@ function doforeach($cmd, $des, $sum, $head, $datetime)
echo $tableend.$tablebegin;
- $dthead = array('' => 1, 'STATUS' => 1, 'Description' => 1, 'When' => 1);
+ $dthead = array('' => 1, 'STATUS' => 1, 'Description' => 1, 'When' => 1, 'API' => 1, 'CGMiner' => 1);
showhead('', null, $dthead);
foreach ($anss as $rig => $ans)
@@ -748,23 +764,20 @@ function doforeach($cmd, $des, $sum, $head, $datetime)
foreach ($ans as $item => $row)
{
- if ($item != 'STATUS')
+ if ($item != 'STATUS' && $item != 'VERSION')
continue;
foreach ($dthead as $name => $x)
{
- if ($name == '')
+ if ($item == 'STATUS' && $name == '')
echo "<td align=right><input type=button value='Rig $rig' onclick='pr(\"?rig=$rig\",null)'></td>";
else
{
if (isset($row[$name]))
- list($showvalue, $class) = fmt('STATUS', $name, $row[$name], $when, null);
- else
{
- $class = '';
- $showvalue = ' ';
+ list($showvalue, $class) = fmt('STATUS', $name, $row[$name], $when, null);
+ echo "<td$class align=right>$showvalue</td>";
}
- echo "<td$class align=right>$showvalue</td>";
}
}
}
@@ -774,6 +787,8 @@ function doforeach($cmd, $des, $sum, $head, $datetime)
echo $tableend;
echo '<tr><td><br><br></td></tr>';
echo $tablebegin;
+
+ return;
}
$total = array();
@@ -985,8 +1000,9 @@ function display()
process(array($preprocess => $preprocess), $rig);
echo $tablebegin;
+ doforeach('version', 'rig summary', array(), array(), true);
$sum = array('MHS av', 'Getworks', 'Found Blocks', 'Accepted', 'Rejected', 'Discarded', 'Stale', 'Utility', 'Local Work', 'Total MH');
- doforeach('summary', 'summary information', $sum, array(), true);
+ doforeach('summary', 'summary information', $sum, array(), false);
echo $tableend;
echo '<tr><td><br><br></td></tr>';
echo $tablebegin;