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 syslog and atmvp

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2292 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-12 22:33:43 +00:00
parent 870abb6afe
commit 02dc746ec9
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/atmvp/auth.inc.php
+2 -6
View File
@@ -2,11 +2,7 @@
if ($_GET['id'] && is_numeric($_GET['id'])) { $atm_vp_id = $_GET['id']; } if ($_GET['id'] && is_numeric($_GET['id'])) { $atm_vp_id = $_GET['id']; }
$sql = "SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D"; $vp = dbFetchRow("SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D WHERE J.juniAtmVp_id = ? AND I.interface_id = J.interface_id AND I.device_id = D.device_id", array($atm_vp_id));
$sql .= " WHERE J.juniAtmVp_id = '".$atm_vp_id."' AND I.interface_id = J.interface_id AND I.device_id = D.device_id";
$query = mysql_query($sql);
$vp = mysql_fetch_assoc($query);
if ($config['allow_unauth_graphs'] || port_permitted($vp['interface_id'])) if ($config['allow_unauth_graphs'] || port_permitted($vp['interface_id']))
{ {
@@ -19,4 +15,4 @@ if ($config['allow_unauth_graphs'] || port_permitted($vp['interface_id']))
$rrd_filename = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd"); $rrd_filename = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd");
} }
?> ?>
html/pages/syslog.inc.php
+12 -11
View File
@@ -13,8 +13,7 @@
<select name="program" id="program"> <select name="program" id="program">
<option value="">All Programs</option> <option value="">All Programs</option>
<?php <?php
$query = mysql_query("SELECT `program` FROM `syslog` GROUP BY `program` ORDER BY `program`"); foreach (dbFetchRows("SELECT `program` FROM `syslog` GROUP BY `program` ORDER BY `program`") as $data)
while ($data = mysql_fetch_assoc($query))
{ {
echo("<option value='".$data['program']."'"); echo("<option value='".$data['program']."'");
if ($data['program'] == $_POST['program']) { echo("selected"); } if ($data['program'] == $_POST['program']) { echo("selected"); }
@@ -28,8 +27,7 @@
<select name="device" id="device"> <select name="device" id="device">
<option value="">All Devices</option> <option value="">All Devices</option>
<?php <?php
$query = mysql_query("SELECT * FROM `devices` ORDER BY `hostname`"); foreach (dbFetchRows("SELECT * FROM `devices` ORDER BY `hostname`") as $data)
while ($data = mysql_fetch_assoc($query))
{ {
echo("<option value='".$data['device_id']."'"); echo("<option value='".$data['device_id']."'");
@@ -51,17 +49,20 @@ print_optionbar_end();
if ($_POST['string']) if ($_POST['string'])
{ {
$where = " AND S.msg LIKE '%".$_POST['string']."%'"; $where = " AND S.msg LIKE ?";
$array[] = "%".$_POST['string']."%";
} }
if ($_POST['program']) if ($_POST['program'])
{ {
$where .= " AND S.program = '".$_POST['program']."'"; $where .= " AND S.program = ?";
$array[] = $_POST['program'];
} }
if ($_POST['device']) if ($_POST['device'])
{ {
$where .= " AND D.device_id = '".$_POST['device']."'"; $where .= " AND D.device_id = ?";
$array[] = $_POST['device'];
} }
if ($_SESSION['userlevel'] >= '5') if ($_SESSION['userlevel'] >= '5')
@@ -70,16 +71,16 @@ if ($_SESSION['userlevel'] >= '5')
WHERE 1 $where ORDER BY timestamp DESC LIMIT 1000"; WHERE 1 $where ORDER BY timestamp DESC LIMIT 1000";
} else { } else {
$sql = "SELECT *, DATE_FORMAT(timestamp, '%D %b %T') AS date from syslog AS S, devices_perms AS P $sql = "SELECT *, DATE_FORMAT(timestamp, '%D %b %T') AS date from syslog AS S, devices_perms AS P
WHERE S.device_id = P.device_id AND P.user_id = " . $_SESSION['user_id'] . " $where ORDER BY timestamp DESC LIMIT 1000"; WHERE S.device_id = P.device_id AND P.user_id = ? $where ORDER BY timestamp DESC LIMIT 1000";
$array = array_merge(array($_SESSION['user_id']), $array);
} }
$query = mysql_query($sql);
echo("<table cellspacing=0 cellpadding=2 width=100%>"); echo("<table cellspacing=0 cellpadding=2 width=100%>");
while ($entry = mysql_fetch_assoc($query)) foreach (dbFetchRows($sql, $array) as $entry)
{ {
$entry = array_merge($entry, device_by_id_cache($entry['device_id'])); $entry = array_merge($entry, device_by_id_cache($entry['device_id']));
include("includes/print-syslog.inc.php"); include("includes/print-syslog.inc.php");
} }
echo("</table>"); echo("</table>");
?> ?>