mirror of
https://github.com/librenms/librenms.git
synced 2024-09-21 18:38:25 +00:00
fixed the interface display in event log, plus some html fixes
git-svn-id: http://www.observium.org/svn/observer/trunk@624 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
parent
3ed1f9a624
commit
a46d4d7ce3
@ -4,19 +4,18 @@
|
||||
if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; }
|
||||
|
||||
$hostname = gethostbyid($entry['host']);
|
||||
$interface = fixifname(getifbyid($entry['interface']));
|
||||
|
||||
unset($icon);
|
||||
|
||||
$icon = geteventicon($entry['message']);
|
||||
if($icon) {$icon = "<img src='images/16/$icon'>"; }
|
||||
if($icon) {$icon = '<img src="images/16/' . $icon . '" />'; }
|
||||
|
||||
|
||||
echo("<tr style=\"background-color: $bg\">
|
||||
<td width=0></td>
|
||||
<td class=syslog width=160>
|
||||
" . $entry['datetime'] . "
|
||||
</td>");
|
||||
echo('<tr style="background-color: ' . $bg . '">
|
||||
<td width="0"></td>
|
||||
<td class="syslog" width="160">
|
||||
' . $entry['datetime'] . '
|
||||
</td>');
|
||||
if(!$_GET[id] && !$overview) {
|
||||
$dev['device_id'] = $entry['host'];
|
||||
$dev['hostname'] = $hostname;
|
||||
@ -25,15 +24,11 @@ if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; }
|
||||
</td>");
|
||||
}
|
||||
|
||||
echo("<td class=syslog>");
|
||||
|
||||
if($interface) {
|
||||
$if['interface_id'] = $entry['interface'];
|
||||
$if['ifDescr'] = $interface;
|
||||
echo(generateiflink($if));
|
||||
echo('<td class="syslog" width="100">');
|
||||
if($entry['interface']) {
|
||||
echo(generateiflink(getifbyid($entry['interface'])));
|
||||
}
|
||||
echo(" " . htmlspecialchars($entry['message']) . "
|
||||
</td>
|
||||
echo("</td><td>" . htmlspecialchars($entry['message']) . "</td>
|
||||
</tr>");
|
||||
|
||||
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
$query = "SELECT *,DATE_FORMAT(datetime, '%D %b %Y %T') as humandate FROM `eventlog` WHERE `host` = '$_GET[id]' ORDER BY `datetime` DESC LIMIT 0,250";
|
||||
$data = mysql_query($query);
|
||||
echo("<table cellspacing=0 cellpadding=1 width=100%>");
|
||||
echo('<table cellspacing="0" cellpadding="1" width="100%">');
|
||||
|
||||
while($entry = mysql_fetch_array($data)) {
|
||||
include("includes/print-event.inc");
|
||||
}
|
||||
echo("</table>");
|
||||
echo('</table>');
|
||||
|
||||
?>
|
||||
?>
|
||||
|
@ -9,7 +9,7 @@ if($_SESSION['userlevel'] >= '5') {
|
||||
$data = mysql_query($query);
|
||||
|
||||
|
||||
echo("<table cellspacing=0 cellpadding=1 width=100%>");
|
||||
echo('<table cellspacing="0" cellpadding="1" width="100%">');
|
||||
|
||||
while($entry = mysql_fetch_array($data)) {
|
||||
include("includes/print-event.inc");
|
||||
@ -17,4 +17,4 @@ while($entry = mysql_fetch_array($data)) {
|
||||
|
||||
echo("</table>");
|
||||
|
||||
?>
|
||||
?>
|
||||
|
@ -51,6 +51,12 @@ function getifindexbyid($id) {
|
||||
}
|
||||
|
||||
function getifbyid($id) {
|
||||
$sql = mysql_query("SELECT * FROM `interfaces` WHERE `interface_id` = '$id'");
|
||||
$result = @mysql_fetch_array($sql);
|
||||
return $result;
|
||||
}
|
||||
|
||||
function getifdescrbyid($id) {
|
||||
$sql = mysql_query("SELECT `ifDescr` FROM `interfaces` WHERE `interface_id` = '$id'");
|
||||
$result = @mysql_result($sql, 0);
|
||||
return $result;
|
||||
|
Loading…
Reference in New Issue
Block a user