diff options
| author | Ermal Luçi <eri@pfsense.org> | 2013-02-12 00:54:29 -0800 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2013-02-12 00:54:29 -0800 |
| commit | 044c5682e837a0209269db63eaaa597fb6757fd6 (patch) | |
| tree | 3b30595c48b1f1fbd7bbcf21af8ed6607cc3eec1 /usr/local | |
| parent | 39866b68e7a563c9fbbe86710d2df621a41ea3f1 (diff) | |
| parent | b06abfe3e1c09448f5d04cfe0c35fcaa22e6208c (diff) | |
| download | pfsense-044c5682e837a0209269db63eaaa597fb6757fd6.zip pfsense-044c5682e837a0209269db63eaaa597fb6757fd6.tar.gz | |
Merge pull request #408 from mdima/master
Status Queue page: Fixes the bytes/bits unit in the page.
Diffstat (limited to 'usr/local')
| -rwxr-xr-x | usr/local/www/status_queues.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php index 5afe37a..657059f 100755 --- a/usr/local/www/status_queues.php +++ b/usr/local/www/status_queues.php @@ -94,7 +94,7 @@ if ($_REQUEST['getactivity']) { $finscript .= "jQuery('#queue{$q->queuename}widthb').width('{$packet_s}');"; $finscript .= "jQuery('#queue{$q->queuename}widtha').width('" . (200 - $packet_s) . "');"; $finscript .= "jQuery('#queue{$q->queuename}pps').val('" . number_format($q->pps,1) . "');"; - $finscript .= "jQuery('#queue{$q->queuename}bps').val('" . str_replace("bytes", "B", format_bytes($q->bandwidth)) . "ps');"; + $finscript .= "jQuery('#queue{$q->queuename}bps').val('" . format_bits($q->bandwidth) . "');"; $finscript .= "jQuery('#queue{$q->queuename}borrows').val('{$q->borrows}');"; $finscript .= "jQuery('#queue{$q->queuename}suspends').val('{$q->suspends}');"; $finscript .= "jQuery('#queue{$q->queuename}drops').val('{$q->drops}');"; @@ -252,4 +252,15 @@ function statsQueues($xml){ $statistics[] = $current; return $current; } +function format_bits($bits) { + if ($bits >= 1000000000) { + return sprintf("%.2f Gbps", $bits/1000000000); + } else if ($bits >= 1000000) { + return sprintf("%.2f Mbps", $bits/1000000); + } else if ($bits >= 1000) { + return sprintf("%.2f Kb", $bits/1000); + } else { + return sprintf("%d b", $bits); + } +} ?> |
