nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 08:02:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix coding style old files (part 2)"

Browse Source
This commit is contained in:
Daniel Preussker
2015-07-15 08:09:10 +00:00
parent 4ebabc634a
commit ba90b85f9f
731 changed files with 33750 additions and 37288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/table/inventory.inc.php
+21 -29
View File
@@ -1,15 +1,14 @@
<?php
$where = '1';
$where = "1";
$param = array();
if ($_SESSION['userlevel'] >= '5') {
$sql = " FROM entPhysical AS E, devices AS D WHERE $where AND D.device_id = E.device_id";
}
else {
$sql = " FROM entPhysical AS E, devices AS D, devices_perms AS P WHERE $where AND D.device_id = E.device_id AND P.device_id = D.device_id AND P.user_id = ?";
} else {
$sql = " FROM entPhysical AS E, devices AS D, devices_perms AS P WHERE $where AND D.device_id = E.device_id AND P.device_id = D.device_id AND P.user_id = ?";
$param[] = $_SESSION['user_id'];
}
@@ -18,32 +17,32 @@ if (isset($searchPhrase) && !empty($searchPhrase)) {
}
if (isset($_POST['string']) && strlen($_POST['string'])) {
$sql .= ' AND E.entPhysicalDescr LIKE ?';
$param[] = '%'.$_POST['string'].'%';
$sql .= " AND E.entPhysicalDescr LIKE ?";
$param[] = "%".$_POST['string']."%";
}
if (isset($_POST['device_string']) && strlen($_POST['device_string'])) {
$sql .= ' AND D.hostname LIKE ?';
$param[] = '%'.$_POST['device_string'].'%';
$sql .= " AND D.hostname LIKE ?";
$param[] = "%".$_POST['device_string']."%";
}
if (isset($_POST['part']) && strlen($_POST['part'])) {
$sql .= ' AND E.entPhysicalModelName = ?';
$param[] = $_POST['part'];
$sql .= " AND E.entPhysicalModelName = ?";
$param[] = $_POST['part'];
}
if (isset($_POST['serial']) && strlen($_POST['serial'])) {
$sql .= ' AND E.entPhysicalSerialNum LIKE ?';
$param[] = '%'.$_POST['serial'].'%';
$sql .= " AND E.entPhysicalSerialNum LIKE ?";
$param[] = "%".$_POST['serial']."%";
}
if (isset($_POST['device']) && is_numeric($_POST['device'])) {
$sql .= ' AND D.device_id = ?';
$param[] = $_POST['device'];
$sql .= " AND D.device_id = ?";
$param[] = $_POST['device'];
}
$count_sql = "SELECT COUNT(`entPhysical_id`) $sql";
$total = dbFetchCell($count_sql, $param);
$total = dbFetchCell($count_sql,$param);
if (empty($total)) {
$total = 0;
}
@@ -55,7 +54,7 @@ if (!isset($sort) || empty($sort)) {
$sql .= " ORDER BY $sort";
if (isset($current)) {
$limit_low = (($current * $rowCount) - ($rowCount));
$limit_low = ($current * $rowCount) - ($rowCount);
$limit_high = $rowCount;
}
@@ -66,19 +65,12 @@ if ($rowCount != -1) {
$sql = "SELECT `D`.`device_id` AS `device_id`, `D`.`hostname` AS `hostname`,`entPhysicalDescr` AS `description`, `entPhysicalName` AS `name`, `entPhysicalModelName` AS `model`, `entPhysicalSerialNum` AS `serial` $sql";
foreach (dbFetchRows($sql, $param) as $invent) {
$response[] = array(
'hostname' => generate_device_link($invent, shortHost($invent['hostname'])),
'description' => $invent['description'],
'name' => $invent['name'],
'model' => $invent['model'],
'serial' => $invent['serial'],
);
$response[] = array('hostname'=>generate_device_link($invent, shortHost($invent['hostname'])),
'description'=>$invent['description'],
'name'=>$invent['name'],
'model'=>$invent['model'],
'serial'=>$invent['serial']);
}
$output = array(
'current' => $current,
'rowCount' => $rowCount,
'rows' => $response,
'total' => $total,
);
$output = array('current'=>$current,'rowCount'=>$rowCount,'rows'=>$response,'total'=>$total);
echo _json_encode($output);