Commit 4003291f75a52382ced96440ed49413246730b04
2012-07-01T00:03:20
miner.php - fix custom totals and colouroverride
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
diff --git a/miner.php b/miner.php
index 12facf9..24d3145 100644
--- a/miner.php
+++ b/miner.php
@@ -154,23 +154,28 @@ function getcss($cssname, $dom = false)
global $colourtable, $colouroverride;
$css = '';
- foreach ($colourtable as $cssdata => $colour)
+ foreach ($colourtable as $cssdata => $value)
{
$cssobj = split(' ', $cssdata, 2);
if ($cssobj[0] == $cssname)
{
if (isset($colouroverride[$cssdata]))
- $color = $colouroverride[$cssdata];
+ $value = $colouroverride[$cssdata];
if ($dom == true)
- $css .= ' '.$cssobj[1].'='.$colour;
+ $css .= ' '.$cssobj[1].'='.$value;
else
- $css .= $cssobj[1].':'.$colour.'; ';
+ $css .= $cssobj[1].':'.$value.'; ';
}
}
return $css;
}
#
+function getdom($domname)
+{
+ return getcss($domname, true);
+}
+#
function htmlhead($checkapi, $rig, $pg = null)
{
global $miner_font_family, $miner_font_size;
@@ -216,7 +221,7 @@ td.lst { $miner_font ".getcss('td.lst')."}
td.hi { $miner_font ".getcss('td.hi')."}
td.lo { $miner_font ".getcss('td.lo')."}
</style>
-</head><body".getcss('body',true).">
+</head><body".getdom('body').">
<script type='text/javascript'>
function pr(a,m){if(m!=null){if(!confirm(m+'?'))return}window.location='$here?ref=$autorefresh'+a}\n";
@@ -517,6 +522,7 @@ function fmt($section, $name, $value, $when, $alldata)
case 'GPU.Utility':
case 'PGA.Utility':
case 'SUMMARY.Utility':
+ case 'total.Utility':
$ret = $value.'/m';
if ($value == 0)
$class = $errorclass;
@@ -575,6 +581,7 @@ function fmt($section, $name, $value, $when, $alldata)
case 'GPU.MHS av':
case 'PGA.MHS av':
case 'SUMMARY.MHS av':
+ case 'total.MHS av':
$parts = explode('.', $value, 2);
if (count($parts) == 1)
$dec = '';
@@ -600,18 +607,25 @@ function fmt($section, $name, $value, $when, $alldata)
case 'GPU.Total MH':
case 'PGA.Total MH':
case 'SUMMARY.Total MH':
+ case 'total.Total MH':
case 'SUMMARY.Getworks':
+ case 'POOL.Getworks':
+ case 'total.Getworks':
case 'GPU.Accepted':
case 'PGA.Accepted':
case 'SUMMARY.Accepted':
+ case 'POOL.Accepted':
+ case 'total.Accepted':
case 'GPU.Rejected':
case 'PGA.Rejected':
case 'SUMMARY.Rejected':
- case 'SUMMARY.Local Work':
- case 'POOL.Getworks':
- case 'POOL.Accepted':
case 'POOL.Rejected':
+ case 'total.Rejected':
+ case 'SUMMARY.Local Work':
+ case 'total.Local Work':
+ case 'SUMMARY.Discarded':
case 'POOL.Discarded':
+ case 'total.Discarded':
$parts = explode('.', $value, 2);
if (count($parts) == 1)
$dec = '';
@@ -1002,8 +1016,6 @@ function doforeach($cmd, $des, $sum, $head, $datetime)
showhead('', $header);
- $section = '';
-
foreach ($anss as $rig => $ans)
{
$when = 0;
@@ -1017,9 +1029,7 @@ function doforeach($cmd, $des, $sum, $head, $datetime)
echo '<tr>';
- $newsection = preg_replace('/\d/', '', $item);
- if ($newsection != 'total')
- $section = $newsection;
+ $section = preg_replace('/\d/', '', $item);
foreach ($header as $name => $x)
{