clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-29 06:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignored and disabled ports will not be showing in the main port list until selected

Browse Source
This commit is contained in:
laf 2015-06-18 23:16:53 +01:00
parent 51ac69449a
commit 7a872ac839
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
html/pages/ports.inc.php
View File

@ -277,6 +277,8 @@ if(!isset($vars['disabled'])) { $vars['disabled'] = "0"; }
if(!isset($vars['deleted'])) { $vars['deleted'] = "0"; } if(!isset($vars['deleted'])) { $vars['deleted'] = "0"; }
$where = ''; $where = '';
$ignore_filter = 0;
$disabled_filter = 0;
foreach ($vars as $var => $value) foreach ($vars as $var => $value)
{ {
@ -297,13 +299,23 @@ foreach ($vars as $var => $value)
$param[] = $value; $param[] = $value;
break; break;
case 'deleted': case 'deleted':
if ($value == 1) {
$where .= " AND `I`.`deleted` = 1";
$ignore_filter = 1;
}
break;
case 'ignore': case 'ignore':
if ($value == 1) if ($value == 1) {
{
$where .= " AND (I.ignore = 1 OR D.ignore = 1) AND I.deleted = 0"; $where .= " AND (I.ignore = 1 OR D.ignore = 1) AND I.deleted = 0";
$ignore_filter = 1;
} }
break; break;
case 'disabled': case 'disabled':
if ($value == 1) {
$where .= " AND `I`.`disabled` = 1 AND `I`.`deleted` = 0";
$disabled_filter = 1;
}
break;
case 'ifSpeed': case 'ifSpeed':
if (is_numeric($value)) if (is_numeric($value))
{ {
@ -345,6 +357,10 @@ foreach ($vars as $var => $value)
} }
} }
if ($ignore_filter == 0 && $disabled_filter == 0) {
$where .= " AND `I`.`ignore` = 0 AND `I`.`disabled` = 0 AND `I`.`deleted` = 0";
}
$query = "SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id ".$where." ".$query_sort; $query = "SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id ".$where." ".$query_sort;
$row = 1; $row = 1;