mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #408 from mdima/master

Browse Source 
Status Queue page: Fixes the bytes/bits unit in the page.
This commit is contained in:
Ermal Luçi 2013-02-12 00:54:29 -08:00
commit 044c5682e8
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr/local/www/status_queues.php
View File

@ -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);
}
}
?>