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

Changing to a simpler fix suggested by @ekoyle

Browse Source
This commit is contained in:
David Bell
2016-03-09 21:01:47 +00:00
parent 6b4d58558f
commit 39aaf84c74
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/table/syslog.inc.php
+8 -10
View File
@@ -1,40 +1,40 @@
<?php
$where = '';
$where = '1';
$param = array();
if (!empty($_POST['searchPhrase'])) {
$where .= 'S.msg LIKE "%'.mres($_POST['searchPhrase']).'%" AND ';
$where .= ' AND S.msg LIKE "%'.mres($_POST['searchPhrase']).'%"';
}
if ($_POST['program']) {
$where .= 'S.program = ? AND ';
$where .= ' AND S.program = ?';
$param[] = $_POST['program'];
}
if (is_numeric($_POST['device'])) {
$where .= ' S.device_id = ? AND ';
$where .= ' AND S.device_id = ?';
$param[] = $_POST['device'];
}
if (!empty($_POST['from'])) {
$where .= 'timestamp >= ? AND ';
$where .= ' AND timestamp >= ?';
$param[] = $_POST['from'];
}
if (!empty($_POST['to'])) {
$where .= 'timestamp <= ? AND ';
$where .= ' AND timestamp <= ?';
$param[] = $_POST['to'];
}
if ($_SESSION['userlevel'] >= '5') {
$sql = 'FROM syslog AS S';
$sql .= ' WHERE '.$where . '1';
$sql .= ' WHERE '.$where;
}
else {
$sql = 'FROM syslog AS S, devices_perms AS P ';
$sql .= 'WHERE S.device_id = P.device_id AND P.user_id = ? AND ';
$sql .= $where . "1";
$sql .= $where;
$param = array_merge(array($_SESSION['user_id']), $param);
}
@@ -61,7 +61,6 @@ if ($rowCount != -1) {
$sql = "SELECT S.*, DATE_FORMAT(timestamp, '".$config['dateformat']['mysql']['compact']."') AS date $sql";
foreach (dbFetchRows($sql, $param) as $syslog) {
$dev = device_by_id_cache($syslog['device_id']);
$response[] = array(
@@ -77,6 +76,5 @@ $output = array(
'rowCount' => $rowCount,
'rows' => $response,
'total' => $total,
'sql' => $sql,
);
echo _json_encode($output);