cleanups code, YAY COMMIT 1000

git-svn-id: http://www.observium.org/svn/observer/trunk@1000 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-03-07 22:22:29 +00:00
parent 82674df959
commit a549e37fff
3 changed files with 71 additions and 56 deletions

View File

@ -1,54 +1,73 @@
<?php
if ($config['overview_show_sysDescr']) {
echo("<div style='font-family: courier, serif; margin: 10px';><strong>" . $device['sysDescr'] . "</strong></div>");
if ($config['overview_show_sysDescr'])
{
echo('<div style="font-family: courier, serif; margin: 10px";><strong>' . $device['sysDescr'] . "</strong></div>");
}
# $uptime = @mysql_result(mysql_query("SELECT `attrib_value` FROM `devices_attribs` WHERE `device_id` = '" . $device['device_id'] . "' AND `attrib_type` = 'uptime'"), 0);
$uptime = $device['uptime'];
if(is_file("images/devices/" . $device['hardware'] . ".gif")) {
if(is_file("images/devices/" . $device['hardware'] . ".gif"))
{
$dev_img = "<div style='float: left;'><img src='images/devices/" . $device['hardware'] . ".gif' align=absmiddle></img></div>";
} elseif (is_file("images/devices/" . $device['hardware'] . ".jpg")) {
}
elseif (is_file("images/devices/" . $device['hardware'] . ".jpg"))
{
$dev_img = "<div style='float: left;'><img src='images/devices/" . $device['hardware'] . ".jpg' align=absmiddle></img></div>";
} else { unset($dev_img); }
}
elseif (is_file("images/devices/" . $device['hardware'] . ".png"))
{
$dev_img = "<div style='float: left;'><img src='images/devices/" . $device['hardware'] . ".png' align=absmiddle></img></div>";
}
else
{
$dev_img = '';
}
if ($device['os'] == "ios") { formatCiscoHardware($device); }
if ($device['features']) { $device['features'] = "(".$device['features'].")"; }
$device['os_text'] = $os_text[$device['os']];
if ($device['os'] == "ios") { formatCiscoHardware($device); }
if ($device['features']) { $device['features'] = "(".$device['features'].")"; }
$device['os_text'] = $os_text[$device[os]];
echo($dev_img . '
<table width="100%">');
echo("$ddev_img
<table width=100%>");
if($device['hardware'])
{
echo('<tr>
<td class="list-bold">Hardware</td>
<td>' . $device['hardware']. '</td>
</tr>');
}
if($device['hardware']) {echo("<tr>
<td class=list-bold>Hardware</td>
<td>" . $device['hardware']. "</td>
</tr>"); }
echo('<tr>
<td class="list-bold">Operating System</td>
<td>' . $device['os_text'] . ' ' . $device['version'] . ' ' . $device['features'] . ' </td>
</tr>');
echo("<tr>
<td class=list-bold>Operating System</td>
<td>" . $device['os_text'] . " " . $device['version'] . " " . $device['features'] . " </td>
</tr>");
if($device['sysContact'])
{
echo('<tr>
<td class="list-bold">Contact</td>
<td>' . htmlspecialchars($device['sysContact']). '</td>
</tr>');
}
if($device['sysContact']) {echo("<tr>
<td class=list-bold>Contact</td>
<td>" . htmlspecialchars($device['sysContact']). "</td>
</tr>"); }
if($device['location'])
{
echo('<tr>
<td class="list-bold">Location</td>
<td>' . $device['location']. '</td>
</tr>');
}
if($device['location']) {echo("<tr>
<td class=list-bold>Location</td>
<td>" . $device['location']. "</td>
</tr>"); }
if($uptime) { echo("<tr>
<td class=list-bold>Uptime</td>
<td>" . formatUptime($uptime) . "</td>
</tr>"); }
echo("
</table>");
if($uptime)
{
echo('<tr>
<td class="list-bold">Uptime</td>
<td>' . formatUptime($uptime) . '</td>
</tr>');
}
echo('
</table>');
?>