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

fixed the interface display in event log, plus some html fixes

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@624 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-01-08 23:09:25 +00:00
parent 3ed1f9a624
commit a46d4d7ce3
4 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
html/includes/print-event.inc
View File

@ -4,19 +4,18 @@
if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; } if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; }
$hostname = gethostbyid($entry['host']); $hostname = gethostbyid($entry['host']);
$interface = fixifname(getifbyid($entry['interface']));
unset($icon); unset($icon);
$icon = geteventicon($entry['message']); $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\"> echo('<tr style="background-color: ' . $bg . '">
<td width=0></td> <td width="0"></td>
<td class=syslog width=160> <td class="syslog" width="160">
" . $entry['datetime'] . " ' . $entry['datetime'] . '
</td>"); </td>');
if(!$_GET[id] && !$overview) { if(!$_GET[id] && !$overview) {
$dev['device_id'] = $entry['host']; $dev['device_id'] = $entry['host'];
$dev['hostname'] = $hostname; $dev['hostname'] = $hostname;
@ -25,15 +24,11 @@ if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; }
</td>"); </td>");
} }
echo("<td class=syslog>"); echo('<td class="syslog" width="100">');
if($entry['interface']) {
if($interface) { echo(generateiflink(getifbyid($entry['interface'])));
$if['interface_id'] = $entry['interface'];
$if['ifDescr'] = $interface;
echo(generateiflink($if));
} }
echo(" " . htmlspecialchars($entry['message']) . " echo("</td><td>" . htmlspecialchars($entry['message']) . "</td>
</td>
</tr>"); </tr>");

6
html/pages/device/events.inc.php
View File

@ -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"; $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); $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)) { while($entry = mysql_fetch_array($data)) {
include("includes/print-event.inc"); include("includes/print-event.inc");
} }
echo("</table>"); echo('</table>');
?> ?>

4
html/pages/eventlog.php
View File

@ -9,7 +9,7 @@ if($_SESSION['userlevel'] >= '5') {
$data = mysql_query($query); $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)) { while($entry = mysql_fetch_array($data)) {
include("includes/print-event.inc"); include("includes/print-event.inc");
@ -17,4 +17,4 @@ while($entry = mysql_fetch_array($data)) {
echo("</table>"); echo("</table>");
?> ?>

6
includes/common.php
View File

@ -51,6 +51,12 @@ function getifindexbyid($id) {
} }
function getifbyid($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'"); $sql = mysql_query("SELECT `ifDescr` FROM `interfaces` WHERE `interface_id` = '$id'");
$result = @mysql_result($sql, 0); $result = @mysql_result($sql, 0);
return $result; return $result;