fix auth for graphs to allow cidr filter. fix schema 006

git-svn-id: http://www.observium.org/svn/observer/trunk@3169 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-05-11 15:21:42 +00:00
parent 5883f9512d
commit f768558e7e
29 changed files with 43 additions and 48 deletions
+3 -3
View File
@@ -768,8 +768,10 @@ function is_port_valid($port, $device)
global $config;
if (!strstr($port['ifDescr'], "irtual"))
if (strstr($port['ifDescr'], "irtual"))
{
$valid = 0;
} else {
$valid = 1;
$if = strtolower($port['ifDescr']);
foreach ($config['bad_if'] as $bi)
@@ -804,8 +806,6 @@ function is_port_valid($port, $device)
}
if (empty($port['ifDescr'])) { $valid = 0; }
if ($device['os'] == "catos" && strstr($if, "vlan")) { $valid = 0; }
} else {
$valid = 0;
}
return $valid;