diff options
| author | Michele Di Maria <michele@nt2.it> | 2013-02-12 07:55:30 +0100 |
|---|---|---|
| committer | Michele Di Maria <michele@nt2.it> | 2013-02-12 07:55:30 +0100 |
| commit | b06abfe3e1c09448f5d04cfe0c35fcaa22e6208c (patch) | |
| tree | bb48869a6c85cd8e4159c9d0edddb6f2839f7af6 /usr/local/www/status_queues.php | |
| parent | ff3003dff44451209b314f441420100f3eef74ea (diff) | |
| download | pfsense-b06abfe3e1c09448f5d04cfe0c35fcaa22e6208c.zip pfsense-b06abfe3e1c09448f5d04cfe0c35fcaa22e6208c.tar.gz | |
Status Queue page: Fixes the bytes/bits unit in the page.
Diffstat (limited to 'usr/local/www/status_queues.php')
| -rwxr-xr-x | usr/local/www/status_queues.php | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php index 2f18775..657059f 100755 --- a/usr/local/www/status_queues.php +++ b/usr/local/www/status_queues.php @@ -85,7 +85,7 @@ if ($_REQUEST['getactivity']) { /* calculate the bigger amount of packets being moved through all queues. */ foreach($statistics as $q) { if ($bigger_packets < $q->pps) - {$bigger_packets = $q->pps;} + $bigger_packets = $q->pps; } $finscript = ""; foreach($statistics as $q) { @@ -94,11 +94,12 @@ 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}');"; } + unset($statistics, $altqstats); header("Content-type: text/javascript"); echo $finscript; exit; @@ -227,6 +228,7 @@ function processQueues($altqstats, $level, $parent_name){ } function statsQueues($xml){ global $statistics; + $current = new QueueStats(); $child = new QueueStats(); $current->queuename = $xml['name'] . $xml['interface']; @@ -250,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); + } +} ?> |
