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

Skip the placeholder databases when outbound is selected, too. Also don't check the name against the gateway list on anything but the quality tab.

Browse Source
This commit is contained in:
Erik Fonnesbeck 2010-08-23 23:24:22 -06:00
parent 44aef5432b
commit 2103b25243
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr/local/www/status_rrd_graph.php
View File

@ -444,11 +444,19 @@ function get_dates($curperiod, $graph) {
$replace = array(" :: ", "", $friendly);
switch($curoption) {
case "outbound":
/* make sure we do not show the placeholder databases in the outbound view */
if((stristr($curdatabase, "outbound")) || (stristr($curdatabase, "allgraphs"))) {
continue 2;
}
/* only show interfaces with a gateway */
$optionc = "$optionc[0]";
if(!interface_has_gateway($optionc)) {
if(!isset($gateways_arr))
$gateways_arr = return_gateways_array();
if(!isset($gateways_arr)) {
if(preg_match("/quality/i", $curdatabase))
$gateways_arr = return_gateways_array();
else
$gateways_arr = array();
}
$found_gateway = false;
foreach ($gateways_arr as $gw) {
if ($gw['name'] == $optionc) {
@ -511,10 +519,18 @@ function get_dates($curperiod, $graph) {
$replace = array(" :: ", "", $friendly);
switch($curoption) {
case "outbound":
/* make sure we do not show the placeholder databases in the outbound view */
if((stristr($curdatabase, "outbound")) || (stristr($curdatabase, "allgraphs"))) {
continue 2;
}
/* only show interfaces with a gateway */
$optionc = "$optionc[0]";
if(!interface_has_gateway($optionc)) {
if(!isset($gateways_arr))
$gateways_arr = return_gateways_array();
if(preg_match("/quality/i", $curdatabase))
$gateways_arr = return_gateways_array();
else
$gateways_arr = array();
$found_gateway = false;
foreach ($gateways_arr as $gw) {
if ($gw['name'] == $optionc) {