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

Fix coding style part 2

Browse Source
This commit is contained in:
Job Snijders
2015-07-13 20:10:26 +02:00
parent ad9590df9b
commit d8693f05ae
733 changed files with 37359 additions and 33947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
html/includes/table/syslog.inc.php
View File

@@ -1,46 +1,44 @@
<?php
$where = "1";
$where = '1';
if (!empty($_POST['searchPhrase']))
{
$where .= ' AND S.msg LIKE "%'.mres($_POST['searchPhrase']).'%"';
if (!empty($_POST['searchPhrase'])) {
$where .= ' AND S.msg LIKE "%'.mres($_POST['searchPhrase']).'%"';
}
if ($_POST['program'])
{
$where .= " AND S.program = ?";
$param[] = $_POST['program'];
if ($_POST['program']) {
$where .= ' AND S.program = ?';
$param[] = $_POST['program'];
}
if (is_numeric($_POST['device']))
{
$where .= " AND S.device_id = ?";
$param[] = $_POST['device'];
if (is_numeric($_POST['device'])) {
$where .= ' AND S.device_id = ?';
$param[] = $_POST['device'];
}
if( !empty($_POST['from']) ) {
$where .= " AND timestamp >= ?";
$param[] = $_POST['from'];
}
if( !empty($_POST['to']) ) {
$where .= " AND timestamp <= ?";
$param[] = $_POST['to'];
if (!empty($_POST['from'])) {
$where .= ' AND timestamp >= ?';
$param[] = $_POST['from'];
}
if ($_SESSION['userlevel'] >= '5')
{
$sql = "FROM syslog AS S";
$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 = ?";
$sql .= $where;
$param = array_merge(array($_SESSION['user_id']), $param);
if (!empty($_POST['to'])) {
$where .= ' AND timestamp <= ?';
$param[] = $_POST['to'];
}
if ($_SESSION['userlevel'] >= '5') {
$sql = 'FROM syslog AS S';
$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 = ?';
$sql .= $where;
$param = array_merge(array($_SESSION['user_id']), $param);
}
$count_sql = "SELECT COUNT(timestamp) $sql";
$total = dbFetchCell($count_sql,$param);
$total = dbFetchCell($count_sql, $param);
if (empty($total)) {
$total = 0;
}
@@ -52,7 +50,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;
}
@@ -62,14 +60,20 @@ 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('timestamp'=>$syslog['date'],
'device_id'=>generate_device_link($dev, shorthost($dev['hostname'])),
'program'=>$syslog['program'],
'msg'=>htmlspecialchars($syslog['msg']));
foreach (dbFetchRows($sql, $param) as $syslog) {
$dev = device_by_id_cache($syslog['device_id']);
$response[] = array(
'timestamp' => $syslog['date'],
'device_id' => generate_device_link($dev, shorthost($dev['hostname'])),
'program' => $syslog['program'],
'msg' => htmlspecialchars($syslog['msg']),
);
}
$output = array('current'=>$current,'rowCount'=>$rowCount,'rows'=>$response,'total'=>$total);
$output = array(
'current' => $current,
'rowCount' => $rowCount,
'rows' => $response,
'total' => $total,
);
echo _json_encode($output);
?>