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 #3714 from phil-davis/patch-10

Browse Source
This commit is contained in:
Renato Botelho 2017-05-03 09:22:30 -03:00
commit 2b9cfd9dad
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/usr/local/www/widgets/widgets/interface_statistics.widget.php
View File

@ -49,21 +49,32 @@ if ($_REQUEST && $_REQUEST['ajax']) {
);
$skipinterfaces = explode(",", $user_settings['widgets'][$_REQUEST['widgetkey']]['iffilter']);
$interface_is_displayed = false;
$an_interface_is_selected = false; // decide if at least 1 interface is selected for display
$an_interface_is_displayed = false; // decide if at least 1 interface is displayed (i.e. not down)
print("<thead>");
print( "<tr>");
print( "<th></th>");
foreach ($ifdescrs as $ifdescr => $ifname) {
if (!in_array($ifdescr, $skipinterfaces)) {
print( "<th>" . $ifname . "</th>");
$interface_is_displayed = true;
if (in_array($ifdescr, $skipinterfaces)) {
continue;
}
$an_interface_is_selected = true;
$ifinfo_arr[$ifdescr] = get_interface_info($ifdescr);
$ifinfo_arr[$ifdescr]['inbytes'] = format_bytes($ifinfo_arr[$ifdescr]['inbytes']);
$ifinfo_arr[$ifdescr]['outbytes'] = format_bytes($ifinfo_arr[$ifdescr]['outbytes']);
if ($ifinfo_arr[$ifdescr]['status'] != "down") {
$an_interface_is_displayed = true;
print("<th>" . $ifname . "</th>");
}
}
if (!$interface_is_displayed) {
if (!$an_interface_is_selected) {
print("<th>" . gettext('All interfaces are hidden.') . "</th>");
} else if (!$an_interface_is_displayed) {
print("<th>" . gettext('All selected interfaces are down.') . "</th>");
}
print( "</tr>");
@ -79,16 +90,10 @@ if ($_REQUEST && $_REQUEST['ajax']) {
continue;
}
$ifinfo = get_interface_info($ifdescr);
if ($ifinfo['status'] == "down") {
continue;
if ($ifinfo_arr[$ifdescr]['status'] != "down") {
print("<td>" . (isset($ifinfo_arr[$ifdescr][$key]) ? htmlspecialchars($ifinfo_arr[$ifdescr][$key]) : 'n/a') . "</td>");
}
$ifinfo['inbytes'] = format_bytes($ifinfo['inbytes']);
$ifinfo['outbytes'] = format_bytes($ifinfo['outbytes']);
print("<td>" . (isset($ifinfo[$key]) ? htmlspecialchars($ifinfo[$key]) : 'n/a') . "</td>");
}
print( "</tr>");