mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

webui: Fix Ports Table AdminDown Search (#5426)

Browse Source
This commit is contained in:
Søren Rosiak
2017-01-14 19:02:22 +02:00
committed by Tony Murray
parent 22470988cb
commit f2d6eff8e9
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,10 +28,10 @@ $param = array();
$sql = 'FROM `ports`'; $sql = 'FROM `ports`';
if (is_admin() === false && is_read() === false) { if (is_admin() === false && is_read() === false) {
$sql .= ' LEFT JOIN `devices_perms` AS `DP` ON `ports`.`device_id` = `DP`.`device_id`'; $sql .= ' LEFT JOIN `devices_perms` AS `DP` ON `ports`.`device_id` = `DP`.`device_id`';
$sql .= ' LEFT JOIN `ports_perms` AS `PP` ON `ports`.`port_id` = `PP`.`port_id`'; $sql .= ' LEFT JOIN `ports_perms` AS `PP` ON `ports`.`port_id` = `PP`.`port_id`';
$where .= ' AND (`DP`.`user_id`=? OR `PP`.`user_id`=?)'; $where .= ' AND (`DP`.`user_id`=? OR `PP`.`user_id`=?)';
$param[] = $_SESSION['user_id']; $param[] = $_SESSION['user_id'];
$param[] = $_SESSION['user_id']; $param[] = $_SESSION['user_id'];
} }
@@ -39,12 +39,12 @@ if (is_admin() === false && is_read() === false) {
$sql .= ' LEFT JOIN `devices` AS `D` ON `ports`.`device_id` = `D`.`device_id`'; $sql .= ' LEFT JOIN `devices` AS `D` ON `ports`.`device_id` = `D`.`device_id`';
if (!empty($_POST['hostname'])) { if (!empty($_POST['hostname'])) {
$where .= ' AND `D`.`hostname` LIKE ?'; $where .= ' AND `D`.`hostname` LIKE ?';
$param[] = '%' . $_POST['hostname'] . '%'; $param[] = '%' . $_POST['hostname'] . '%';
} }
if (!empty($_POST['location'])) { if (!empty($_POST['location'])) {
$where .= " AND `D`.`location` = ?"; $where .= " AND `D`.`location` = ?";
$param[] = $_POST['location']; $param[] = $_POST['location'];
} }
@@ -55,13 +55,27 @@ if (!empty($_POST['errors'])) {
} }
if (!empty($_POST['device_id'])) { if (!empty($_POST['device_id'])) {
$sql .= ' AND `ports`.`device_id`=?'; $sql .= ' AND `ports`.`device_id`=?';
$param[] = $_POST['device_id']; $param[] = $_POST['device_id'];
} }
if (!empty($_POST['state'])) { if (!empty($_POST['state'])) {
$sql .= ' AND `ports`.`ifOperStatus`=?'; switch ($_POST['state']) {
$param[] = $_POST['state']; case "down":
$sql .= " AND `ports`.`ifAdminStatus` = ? AND `ports`.`ifOperStatus` = ?";
$param[] = "up";
$param[] = "down";
break;
case "up":
$sql .= " AND `ports`.`ifAdminStatus` = ? AND `ports`.`ifOperStatus` = ?";
$param[] = "up";
$param[] = "up";
break;
case "admindown":
$sql .= " AND `ports`.`ifAdminStatus` = ? AND `D`.`ignore` = 0";
$param[] = "down";
break;
}
} }
if (!empty($_POST['ifSpeed'])) { if (!empty($_POST['ifSpeed'])) {
@@ -81,16 +95,16 @@ if (!empty($_POST['port_descr_type'])) {
if (!empty($_POST['ifAlias'])) { if (!empty($_POST['ifAlias'])) {
$sql .= ' AND `ports`.`ifAlias` LIKE ?'; $sql .= ' AND `ports`.`ifAlias` LIKE ?';
$param[] = '%'.$_POST['ifAlias'].'%'; $param[] = '%' . $_POST['ifAlias'] . '%';
} }
$sql .= ' AND `ports`.`disabled`=?'; $sql .= ' AND `ports`.`disabled`=?';
$param[] = (int)(isset($_POST['disabled']) && $_POST['disabled']); $param[] = (int)(isset($_POST['disabled']) && $_POST['disabled']);
$sql .= ' AND `ports`.`ignore`=?'; $sql .= ' AND `ports`.`ignore`=?';
$param[] = (int)(isset($_POST['ignore']) && $_POST['ignore']); $param[] = (int)(isset($_POST['ignore']) && $_POST['ignore']);
$sql .= ' AND `ports`.`deleted`=?'; $sql .= ' AND `ports`.`deleted`=?';
$param[] = (int)(isset($_POST['deleted']) && $_POST['deleted']); $param[] = (int)(isset($_POST['deleted']) && $_POST['deleted']);
$count_sql = "SELECT COUNT(`ports`.`port_id`) $sql"; $count_sql = "SELECT COUNT(`ports`.`port_id`) $sql";
@@ -110,7 +124,7 @@ if (isset($sort) && !empty($sort)) {
} }
if (isset($current)) { if (isset($current)) {
$limit_low = (($current * $rowCount) - ($rowCount)); $limit_low = (($current * $rowCount) - ($rowCount));
$limit_high = $rowCount; $limit_high = $rowCount;
} }
@@ -160,10 +174,10 @@ foreach (dbFetchRows($query, $param) as $port) {
} }
$output = array( $output = array(
'current' => $current, 'current' => $current,
'rowCount' => $rowCount, 'rowCount' => $rowCount,
'rows' => $response, 'rows' => $response,
'total' => $total, 'total' => $total,
); );
echo _json_encode($output); echo _json_encode($output);