lots of updates!

git-svn-id: http://www.observium.org/svn/observer/trunk@330 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2008-12-09 13:55:41 +00:00
parent d05d9722b2
commit 737d9bad63
12 changed files with 67 additions and 38 deletions

View File

@@ -1,8 +1,8 @@
<meta http-equiv="refresh" content="60">
<div style="background-color: #eeeeee; padding: 10px;">
<form id="form1" name="form1" method="post" action="">
<form method="post" action="">
<label><strong>Search</strong>
<input type="text" name="search" id="search" />
<input type="text" name="string" id="string" value="<?php echo($_POST['string']); ?>" />
</label>
<label>
<strong>Program</strong>
@@ -11,7 +11,9 @@
<?php
$query = mysql_query("SELECT `program` FROM `syslog` GROUP BY `program` ORDER BY `program`");
while($data = mysql_fetch_array($query)) {
echo("<option value='".$data['program']."'>".$data['program']."</option>");
echo("<option value='".$data['program']."'");
if($data['program'] == $_POST['program']) { echo("selected"); }
echo(">".$data['program']."</option>");
}
?>
</select>
@@ -24,6 +26,8 @@
$query = mysql_query("SELECT * FROM `devices` ORDER BY `hostname`");
while($data = mysql_fetch_array($query)) {
echo("<option value='".$data['device_id']."'");
if($data['device_id'] == $_POST['device']) { echo("selected"); }
echo(">".$data['hostname']."</option>");
}
@@ -38,7 +42,19 @@
<?
$sql = "SELECT *, DATE_FORMAT(datetime, '%D %b %T') AS date from syslog ORDER BY datetime DESC LIMIT 1000";
if($_POST['string']) {
$where = " AND S.msg LIKE '%".$_POST['string']."%'";
}
if($_POST['program']) {
$where .= " AND S.program = '".$_POST['program']."'";
}
if($_POST['device']) {
$where .= " AND D.device_id = '".$_POST['device']."'";
}
$sql = "SELECT *, DATE_FORMAT(datetime, '%D %b %T') AS date from syslog AS S, devices AS D WHERE S.device_id = D.device_id $where ORDER BY datetime DESC LIMIT 1000";
$query = mysql_query($sql);
echo("<table cellspacing=0 cellpadding=2 width=100%>");
while($entry = mysql_fetch_array($query)) { include("includes/print-syslog.inc"); }