From 20a53c7a7fd347aa6354e682e30d3b9fce82803c Mon Sep 17 00:00:00 2001 From: kanoi Date: Wed, 3 Feb 2016 11:31:04 +1100 Subject: [PATCH] php - use thead/tbody/tfoot for tables --- pool/inc.php | 4 ++-- pool/page_addrmgt.php | 8 +++++--- pool/page_blocks.php | 16 +++++++++------- pool/page_ckp.php | 6 ++++-- pool/page_mpayouts.php | 30 ++++++++++++++++-------------- pool/page_payments.php | 20 +++++++++++--------- pool/page_percent.php | 18 ++++++------------ pool/page_shifts.php | 29 +++++++++++++++-------------- pool/page_stats.php | 10 ++++++---- pool/page_userinfo.php | 14 ++++++++------ pool/page_workers.php | 18 ++++++------------ 11 files changed, 88 insertions(+), 85 deletions(-) diff --git a/pool/inc.php b/pool/inc.php index 9b1c9554..c3fc5ef3 100644 --- a/pool/inc.php +++ b/pool/inc.php @@ -145,8 +145,8 @@ h1 {margin-top:20px;float:middle;font-size:20px;} # function SortJS() { - $s = "function sot(t,s,o){if(t && s>=0){var rs=t.rows;if(rs && rs.length>2){var all=[], rn, ok=true;for(rn=1;rn'; $pg .= "\n"; - $pg .= ''; + $pg .= ''; $pg .= ''; $pg .= ''; $pg .= ''; @@ -35,9 +35,10 @@ function dockp($data, $user) $pg .= ''; $pg .= ''; $pg .= ''; - $pg .= "\n"; + $pg .= "\n"; if ($ans['STATUS'] == 'ok') { + $pg .= ''; $count = $ans['rows']; for ($i = 0; $i < $count; $i++) { @@ -56,6 +57,7 @@ function dockp($data, $user) $pg .= ''; $pg .= "\n"; } + $pg .= ''; } $pg .= "
NameInitialAllocatedRAMRAM2Cull
'.stnum($ans['cull:'.$i]).'
\n"; diff --git a/pool/page_mpayouts.php b/pool/page_mpayouts.php index ca962854..086c588b 100644 --- a/pool/page_mpayouts.php +++ b/pool/page_mpayouts.php @@ -12,20 +12,21 @@ function dompayouts($data, $user) $pg .= "Payments page for the payments you've been sent.

"; $pg .= "\n"; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= "\n"; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= "\n"; if ($ans['STATUS'] == 'ok') { + $pg .= ''; $totamt = 0; $count = $ans['rows']; for ($i = 0; $i < $count; $i++) @@ -56,6 +57,7 @@ function dompayouts($data, $user) $pg .= ''; $pg .= "\n"; } + $pg .= ''; if ($count > 1) { if (($i % 2) == 0) @@ -63,11 +65,11 @@ function dompayouts($data, $user) else $row = 'odd'; - $pg .= ""; + $pg .= ""; $pg .= ''; $pg .= ''; $pg .= ''; - $pg .= "\n"; + $pg .= "\n"; } } $pg .= "
BlockBlock UTCMiner RewardN DiffN RangePool N AvgYour %Your N DiffYour N AvgYour BTC
BlockBlock UTCMiner RewardN DiffN RangePool N AvgYour %Your N DiffYour N AvgYour BTC
'.btcfmt($amount).'
Total:'.btcfmt($totamt).'
\n"; diff --git a/pool/page_payments.php b/pool/page_payments.php index e9364ff3..a00298f1 100644 --- a/pool/page_payments.php +++ b/pool/page_payments.php @@ -26,15 +26,16 @@ function dopayments($data, $user) $ans = getPayments($user); $pg .= "\n"; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= "\n"; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= "\n"; if ($ans['STATUS'] == 'ok') { + $pg .= ''; $all = array(); $count = $ans['rows']; for ($i = 0; $i < $count; $i++) @@ -70,12 +71,13 @@ function dopayments($data, $user) $pg .= ""; $pg .= "\n"; } + $pg .= ''; if ($hasdust === true) { - $pg .= ''; + $pg .= ''; } } $pg .= "
BlockAddressStatusBTC
BlockAddressStatusBTC
$dust
'; + $pg .= '
'; $pg .= '* '; $pg .= 'Dust payments are not automatically sent out'; - $pg .= '
\n"; diff --git a/pool/page_percent.php b/pool/page_percent.php index 1e303691..90b56cab 100644 --- a/pool/page_percent.php +++ b/pool/page_percent.php @@ -2,7 +2,7 @@ # function pertitle($data, $user) { - $pg = ''; + $pg = ''; $pg .= 'Address'; $pg .= 'ID'; $pg .= 'Shares'; @@ -12,7 +12,7 @@ function pertitle($data, $user) $pg .= 'Hash Rate'; $pg .= 'Ratio'; $pg .= 'Addr %'; - $pg .= "\n"; + $pg .= "\n"; return $pg; } # @@ -30,6 +30,7 @@ function peruser($data, $user, &$offset, &$totshare, &$totdiff, $pg = ''; if ($ans['STATUS'] == 'ok') { + $pg .= ''; if (isset($ans['blockacc'])) $blockacc = $ans['blockacc']; if (isset($ans['blockreward'])) @@ -103,6 +104,7 @@ function peruser($data, $user, &$offset, &$totshare, &$totdiff, $offset++; } + $pg .= ''; } return $pg; } @@ -115,7 +117,7 @@ function pertotal($offset, $totshare, $totdiff, $totinvalid, $totrate, $blockacc $row = 'even'; else $row = 'odd'; - $pg .= "Total:"; + $pg .= "Total:"; $pg .= " "; $shareacc = number_format($totshare, 0); $pg .= "$shareacc"; @@ -133,7 +135,7 @@ function pertotal($offset, $totshare, $totdiff, $totinvalid, $totrate, $blockacc $blkpct = number_format(100.0 * $totdiff / $blockacc, 3) . '%'; $pg .= "$blkpct"; $pg .= "$totrate"; - $pg .= "\n"; + $pg .= "\n"; return $pg; } # @@ -157,14 +159,6 @@ function dopercent($data, $user) $pg .= pertotal($offset, $totshare, $totdiff, $totinvalid, $totrate, $blockacc, $blockreward); - if ($blockacc > 0 && $blockreward > 0) - { - $btc = btcfmt($totdiff / $blockacc * $blockreward); - $pg .= ''; - $pg .= "
Payout est if block found at 100%: ~$btc BTC"; - $pg .= ''; - } - $pg .= "\n"; return $pg; diff --git a/pool/page_shifts.php b/pool/page_shifts.php index 2b330647..66d33c4d 100644 --- a/pool/page_shifts.php +++ b/pool/page_shifts.php @@ -6,19 +6,19 @@ function doshifts($data, $user) $pg = "Click here to jump to the start of the last payout

"; $pg .= "\n"; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= "\n"; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= "\n"; if (($ans['STATUS'] != 'ok') || !isset($ans['prefix_all'])) $pg = '

Shifts

'.$pg; @@ -27,7 +27,7 @@ function doshifts($data, $user) $pre = $ans['prefix_all']; $count = $ans['rows']; - $pg = '

Last '.($count+1).' Shifts

'.$pg; + $pg = '

Last '.($count+1).' Shifts

'.$pg.''; for ($i = 0; $i < $count; $i++) { $u = ''; @@ -93,6 +93,7 @@ function doshifts($data, $user) $pg .= ""; $pg .= "\n"; } + $pg .= ''; } $pg .= "
ShiftStart UTCLengthYour DiffInv DiffAvg HsSharesAvg ShareRewardsRewarded*PPS%
ShiftStart UTCLengthYour DiffInv DiffAvg HsSharesAvg ShareRewardsRewarded*PPS%
$pgot
\n"; $pg .= "* The Rewarded value unit is satoshis per 1diff share
"; diff --git a/pool/page_stats.php b/pool/page_stats.php index 6c44c3ed..bd525790 100644 --- a/pool/page_stats.php +++ b/pool/page_stats.php @@ -66,12 +66,13 @@ function dostats($data, $user) $ans = getAllUsers($user); $pg .= "\n"; - $pg .= ""; - $pg .= ""; - $pg .= ""; - $pg .= "\n"; + $pg .= ''; + $pg .= ''; + $pg .= ''; + $pg .= "\n"; if ($ans['STATUS'] == 'ok') { + $pg .= ''; $all = array(); $count = $ans['rows']; for ($i = 0; $i < $count; $i++) @@ -100,6 +101,7 @@ function dostats($data, $user) $pg .= ""; $pg .= "\n"; } + $pg .= ''; } $pg .= "
UsernameHash Rate 5m
UsernameHash Rate 5m
$dsp
\n"; diff --git a/pool/page_userinfo.php b/pool/page_userinfo.php index 95e12ca4..fc235610 100644 --- a/pool/page_userinfo.php +++ b/pool/page_userinfo.php @@ -21,18 +21,19 @@ function douserinfo($data, $user) $pg = '

Block Acclaim

'; $pg .= "\n"; - $pg .= ""; - $pg .= ""; - $pg .= ""; + $pg .= ''; + $pg .= ''; + $pg .= ''; if ($sall) { - $pg .= ""; - $pg .= ""; + $pg .= ''; + $pg .= ''; } - $pg .= "\n"; + $pg .= "\n"; if ($ans['STATUS'] == 'ok') { + $pg .= ''; $all = array(); $count = $ans['rows']; for ($i = 0; $i < $count; $i++) @@ -73,6 +74,7 @@ function douserinfo($data, $user) } $pg .= "\n"; } + $pg .= ''; } $pg .= "
UserBlocks
UserBlocksDiffAvgDiffAvg
\n"; diff --git a/pool/page_workers.php b/pool/page_workers.php index 2ef1828b..806a7d4c 100644 --- a/pool/page_workers.php +++ b/pool/page_workers.php @@ -15,7 +15,7 @@ function worktitle($data, $user) { addSort(); $r = "input type=radio name=srt onclick=\"sott('worksrt',this);\""; - $pg = ''; + $pg = ''; $pg .= "Worker Name:<$r id=srtwrk data-sf=s0>"; $pg .= 'Work Diff'; $pg .= "<$r id=srtlst data-sf=n2>:Last Share"; @@ -30,7 +30,7 @@ function worktitle($data, $user) $pg .= "<$r id=srtreject data-sf=r11>:Rej"; $pg .= 'Block %'; $pg .= "<$r id=srtrate data-sf=r13>:Hash Rate"; - $pg .= "\n"; + $pg .= "\n"; return $pg; } # @@ -49,6 +49,7 @@ function workuser($data, $user, &$offset, &$totshare, &$totdiff, $pg = ''; if ($ans['STATUS'] == 'ok') { + $pg .= ''; if (isset($ans['blockacc'])) $blockacc = $ans['blockacc']; if (isset($ans['blockreward'])) @@ -202,6 +203,7 @@ function workuser($data, $user, &$offset, &$totshare, &$totdiff, $offset++; } + $pg .= ''; } return $pg; } @@ -221,7 +223,7 @@ function worktotal($offset, $totshare, $totdiff, $totshrate, $totinvalid, $row = 'even'; else $row = 'odd'; - $pg .= "Total: $offset$dspinst"; + $pg .= "Total: $offset$dspinst"; $shareacc = number_format($totshare, 0); $pg .= "$shareacc"; $diffacc = number_format($totdiff, 0); @@ -239,7 +241,7 @@ function worktotal($offset, $totshare, $totdiff, $totshrate, $totinvalid, $blkpct = number_format(100.0 * $totdiff / $blockacc, 3) . '%'; $pg .= " "; $pg .= "$blkpct"; - $pg .= "$totrate\n"; + $pg .= "$totrate\n"; return $pg; } # @@ -266,14 +268,6 @@ function doworker($data, $user) $pg .= worktotal($offset, $totshare, $totdiff, $totshrate, $totinvalid, $totrate, $blockacc, $blockreward, $instances); - if (false && $blockacc > 0 && $blockreward > 0) - { - $btc = btcfmt($totdiff / $blockacc * $blockreward); - $pg .= ''; - $pg .= "
Payout est if block found at 100%: ~$btc BTC"; - $pg .= ''; - } - $pg .= "\n"; $pg .= "\n";