clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 02:48:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ports page includes disabled, ignored, and deleted ports (#4419)

Browse Source
This commit is contained in:
Tony Murray 2016-09-13 20:33:07 -05:00 committed by GitHub
parent 05b728bb80
commit 2529109fc4
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
html/includes/table/ports.inc.php
View File

@ -2,7 +2,7 @@
/**
* ports.inc.php
*
* -Description-
* Exports the ports table to json
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -23,7 +23,6 @@
* @author Tony Murray <murraytony@gmail.com>
*/
list($sort_column, $sort_order) = explode(' ', trim($sort));
$where = "`D`.`hostname` != '' ";
$param = array();
$sql = 'FROM `ports`';
@ -85,29 +84,20 @@ if (!empty($_POST['ifAlias'])) {
$param[] = '%'.$_POST['ifAlias'].'%';
}
if (!empty($_POST['disabled'])) {
$sql .= ' AND `ports`.`disabled`=?';
$param[] = $_POST['disabled'];
}
$sql .= ' AND `ports`.`disabled`=?';
$param[] = (int)(isset($_POST['disabled']) && $_POST['disabled']);
if (!empty($_POST['ignore'])) {
$sql .= ' AND `ports`.`ignore`=?';
$param[] = $_POST['ignore'];
}
if (!empty($_POST['deleted'])) {
$sql .= ' AND `ports`.`deleted`=?';
$param[] = $_POST['deleted'];
}
$sql .= ' AND `ports`.`ignore`=?';
$param[] = (int)(isset($_POST['ignore']) && $_POST['ignore']);
$sql .= ' AND `ports`.`deleted`=?';
$param[] = (int)(isset($_POST['deleted']) && $_POST['deleted']);
$count_sql = "SELECT COUNT(`ports`.`port_id`) $sql";
$total = dbFetchCell($count_sql, $param);
if (empty($total)) {
$total = 0;
}
$total = (int)dbFetchCell($count_sql, $param);
if (isset($sort) && !empty($sort)) {
list($sort_column, $sort_order) = explode(' ', trim($sort));
if ($sort_column == 'device') {
$sql .= " ORDER BY `D`.`hostname` $sort_order";
} elseif ($sort_column == 'port') {

2
includes/rewrites.php
View File

@ -77,8 +77,6 @@ function ifLabel($interface, $device = null)
if ($interface['ifName'] == '') {
$interface['label'] = $interface['ifDescr'];
} else {
$interface['label'] = $interface['ifName'];
}
} elseif (isset($config['os'][$os]['ifalias'])) {
$interface['label'] = $interface['ifAlias'];