code cleanups, remove more dead code

git-svn-id: http://www.observium.org/svn/observer/trunk@1900 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-17 11:29:23 +00:00
parent 9f24ca4248
commit aedac10866
6 changed files with 311 additions and 370 deletions

View File

@ -1,63 +1,64 @@
<?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 = $device['uptime'];
$uptime = $device['uptime'];
if ($device['os'] == "ios") { formatCiscoHardware($device); }
if ($device['features']) { $device['features'] = "(".$device['features'].")"; }
$device['os_text'] = $config['os'][$device['os']]['text'];
if ($device['os'] == "ios") { formatCiscoHardware($device); }
if ($device['features']) { $device['features'] = "(".$device['features'].")"; }
$device['os_text'] = $config['os'][$device['os']]['text'];
echo('<table width="100%">');
if($device['hardware'])
{
echo('<tr>
<td class="list-bold">Hardware</td>
<td>' . $device['hardware']. '</td>
</tr>');
}
if($device['serial'])
{
echo('<tr>
<td class="list-bold">Serial</td>
<td>' . $device['serial']. '</td>
</tr>');
}
echo('<table width="100%">');
if ($device['hardware'])
{
echo('<tr>
<td class="list-bold">Operating System</td>
<td>' . $device['os_text'] . ' ' . $device['version'] . ' ' . $device['features'] . ' </td>
</tr>');
<td class="list-bold">Hardware</td>
<td>' . $device['hardware']. '</td>
</tr>');
}
if($device['sysContact'])
{
echo('<tr>
<td class="list-bold">Contact</td>
<td>' . htmlspecialchars($device['sysContact']). '</td>
</tr>');
}
if ($device['serial'])
{
echo('<tr>
<td class="list-bold">Serial</td>
<td>' . $device['serial']. '</td>
</tr>');
}
if($device['location'])
{
echo('<tr>
<td class="list-bold">Location</td>
<td>' . $device['location']. '</td>
</tr>');
}
echo('<tr>
<td class="list-bold">Operating System</td>
<td>' . $device['os_text'] . ' ' . $device['version'] . ' ' . $device['features'] . ' </td>
</tr>');
if($uptime)
{
echo('<tr>
<td class="list-bold">Uptime</td>
<td>' . formatUptime($uptime) . '</td>
</tr>');
}
if ($device['sysContact'])
{
echo('<tr>
<td class="list-bold">Contact</td>
<td>' . htmlspecialchars($device['sysContact']). '</td>
</tr>');
}
echo('
</table>');
?>
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>');
?>