From bb0cecc5b0dc6c67429cf530c1d3cb354f507599 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Sat, 9 Jan 2010 00:42:45 +0000
Subject: [PATCH] more html fixes - yes, Adam, I'm anal like that ;-)

git-svn-id: http://www.observium.org/svn/observer/trunk@627 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/pages/device.php  | 174 ++++++++++++++++++-----------------------
 includes/functions.php |   8 +-
 2 files changed, 80 insertions(+), 102 deletions(-)

diff --git a/html/pages/device.php b/html/pages/device.php
index 2ffd013b7..aed39c777 100644
--- a/html/pages/device.php
+++ b/html/pages/device.php
@@ -16,16 +16,13 @@ $select[$section] = "selected";
 
 $device_query = mysql_query("SELECT * FROM `devices` WHERE `device_id` = '" . $_GET['id'] . "'");
 while($device = mysql_fetch_array($device_query)) {
-  echo("<table cellpadding=15
- cellspacing=0 class=devicetable width=100%>");
+  echo('<table cellpadding="15" cellspacing="0" class="devicetable" width="100%">');
   include("includes/device-header.inc");
   echo("</table>");
 
 echo("<div class=mainpane>");
 
-echo("
-<ul id='maintab' class='shadetabs'>
-");
+echo('<ul id="maintab" class="shadetabs">');
 
 
 #echo("
@@ -36,12 +33,11 @@ echo("
 #  </a>
 #</li>");
 
-echo("<li class=" . $select['graphs'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/graphs/'>
-    <img src='images/16/server_chart.png' align=absmiddle border=0> Graphs
+echo('<li class="' . $select['graphs'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/graphs/">
+    <img src="images/16/server_chart.png" align="absmiddle" border="0"> Graphs
   </a>
-</li>
-");
+</li>');
 
 $health =  mysql_result(mysql_query("select count(*) from storage WHERE host_id = '" . $device['device_id'] . "'"), 0) +
            mysql_result(mysql_query("select count(temp_id) from temperature WHERE temp_host = '" . $device['device_id'] . "'"), 0) +
@@ -49,108 +45,93 @@ $health =  mysql_result(mysql_query("select count(*) from storage WHERE host_id
            mysql_result(mysql_query("select count(*) from cpmCPU WHERE device_id = '" . $device['device_id'] . "'"), 0);
 
 if($health) {
-  echo("
-<li class=" . $select['health'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/health/'>
-    <img src='images/16/chart_curve.png' align=absmiddle border=0> Health
+  echo('<li class="' . $select['health'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/health/">
+    <img src="images/16/chart_curve.png" align="absmiddle" border="0" /> Health
   </a>
-</li>
-");
+</li>');
 }
 
 $cisco_sensors = mysql_result(mysql_query("SELECT count(*) FROM `entPhysical` WHERE device_id = '".$device['device_id']."' AND entSensorType != '' AND entSensorType NOT LIKE 'No%'"),0);
 
 if($cisco_sensors) {
-  echo("
-<li class=" . $select['ciscosensors'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/ciscosensors/'>
-    <img src='images/16/contrast.png' align=absmiddle border=0> Sensors
+  echo('<li class="' . $select['ciscosensors'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/ciscosensors/">
+    <img src="images/16/contrast.png" align="absmiddle" border="0" /> Sensors
   </a>
-</li>
-");
+</li>');
 }
 
 if(is_dir($config['collectd_dir'] . "/" . $device['hostname'] ."/")) {
-  echo("
-<li class=" . $select['collectd'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/collectd/'>
-    <img src='images/16/chart_line.png' align=absmiddle border=0> CollectD
+  echo('<li class="' . $select['collectd'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/collectd/">
+    <img src="images/16/chart_line.png" align="absmiddle" border="0" /> CollectD
   </a>
-</li>
-");
+</li>');
 }
 
 if(@mysql_result(mysql_query("select count(interface_id) from interfaces WHERE device_id = '" . $device['device_id'] . "'"), 0) > '0') {
-  echo("
-<li class=" . $select['ports'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/ports/".$config['ports_page_default']."'>
-    <img src='images/16/connect.png' align=absmiddle border=0> Ports
+  echo('<li class="' . $select['ports'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/ports/' .$config['ports_page_default']. '">
+    <img src="images/16/connect.png" align="absmiddle" border="0" /> Ports
   </a>
-</li>");
+</li>');
 }
 
 if(@mysql_result(mysql_query("select count(vlan_id) from vlans WHERE device_id = '" . $device['device_id'] . "'"), 0) > '0') {
-  echo("
-<li class=" . $select['vlans'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/'>
-    <img src='images/16/vlans.png' align='absmiddle' border='0'> VLANs
+  echo('<li class="' . $select['vlans'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/vlans/">
+    <img src="images/16/vlans.png" align="absmiddle" border="0" /> VLANs
   </a>
-</li>");
+</li>');
 }
 
 if(@mysql_result(mysql_query("select count(*) from vrfs WHERE device_id = '" . $device['device_id'] . "'"), 0) > '0') {
-  echo("
-<li class=" . $select['vrfs'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/vrfs/'>
-    <img src='images/16/layers.png' align=absmiddle border=0> VRFs
+  echo('<li class="' . $select['vrfs'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/vrfs/">
+    <img src="images/16/layers.png" align="absmiddle" border="0" /> VRFs
   </a>
-</li>");
+</li>');
 }
 
 
 if($config['enable_bgp'] && $device['bgpLocalAs']) {
-  echo("
-<li class=" . $select['bgp'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/bgp/'>
-    <img src='images/16/link.png' align=absmiddle border=0> BGP
+  echo('<li class="' . $select['bgp'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/bgp/">
+    <img src="images/16/link.png" align="absmiddle" border="0" /> BGP
   </a>
-</li>");
+</li>');
 }
 
 if(@mysql_result(mysql_query("SELECT count(*) FROM nagios_hosts WHERE address = '".$device['hostname']."'", $nagios_link), 0) > '0') {
-  echo("
-<li class=" . $select['nagios'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/nagios/'>
-    <img src='images/16/transmit_blue.png' align=absmiddle border=0> Nagios
+  echo('<li class="' . $select['nagios'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/nagios/">
+    <img src="images/16/transmit_blue.png" align="absmiddle" border="0" /> Nagios
   </a>
-</li>");
+</li>');
 }
 
 
 if($_SESSION[userlevel] >= "5" && mysql_result(mysql_query("SELECT count(*) FROM links AS L, interfaces AS I WHERE I.device_id = '".$device['device_id']."' AND I.interface_id = L.src_if"),0)) {
-  echo("
-<li class=" . $select['map'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/map/'>
-    <img src='images/16/chart_organisation.png' align=absmiddle border=0> Map
+  echo('<li class="' . $select['map'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/map/">
+    <img src="images/16/chart_organisation.png" align="absmiddle" border="0" /> Map
   </a>
-</li>
-");
+</li>');
 }
 
 if($config['enable_inventory'] && @mysql_result(mysql_query("SELECT * FROM `entPhysical` WHERE device_id = '".$_GET['id']."'"), 0) > '0') {
-  echo("<li class=" . $select['entphysical'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/entphysical/'>
-    <img src='images/16/bricks.png' align=absmiddle border=0> Inventory
+  echo('<li class="' . $select['entphysical'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/entphysical/">
+    <img src="images/16/bricks.png" align="absmiddle" border="0" /> Inventory
   </a>
-</li>
-");
+</li>');
 } elseif ( $config['enable_inventory'] && @mysql_result(mysql_query("SELECT * FROM `hrDevice` WHERE device_id = '".$_GET['id']."'"), 0) > '0') {
-  echo("<li class=" . $select['hrdevice'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/hrdevice/'>
-    <img src='images/16/bricks.png' align=absmiddle border=0> Inventory
+  echo('<li class="' . $select['hrdevice'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/hrdevice/">
+    <img src="images/16/bricks.png" align="absmiddle" border="0" /> Inventory
   </a>
-</li>
-");
+</li>');
 }
 
 
@@ -158,8 +139,8 @@ if($config['enable_inventory'] && @mysql_result(mysql_query("SELECT * FROM `entP
 #if(mysql_result(mysql_query("select count(storage_id) from storage WHERE host_id = '" . $device['device_id'] . "'"), 0) > '0') {
 #  echo("
 #<li class=" . $select['storage'] . ">
-#  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/storage/'>
-#    <img src='images/16/database.png' align=absmiddle border=0> Storage
+#  <a href='".$config['base_url']."/device/" . $device['device_id'] . '/storage/">
+#    <img src="images/16/database.png" align="absmiddle" border="0" /> Storage
 #  </a>
 #</li>
 #");
@@ -167,54 +148,51 @@ if($config['enable_inventory'] && @mysql_result(mysql_query("SELECT * FROM `entP
 
 
 if(mysql_result(mysql_query("select count(service_id) from services WHERE service_host = '" . $device['device_id'] . "'"), 0) > '0') {
-  echo("
-<li class=" . $select['srv'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/srv/'>
-    <img src='images/16/server_cog.png' align=absmiddle border=0> Services
+  echo('<li class="' . $select['srv'] . '">
+  <a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/srv/">
+    <img src="images/16/server_cog.png" align="absmiddle" border="0" /> Services
   </a>
 </li>
-");
+');
 }
 
-echo("
-<li class=" . $select['events'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/events/'>
-    <img src='images/16/report_magnify.png' align=absmiddle border=0> Events
+echo('<li class="' . $select['events'] . '">
+  <a href="'.$config['base_url']. "/device/" . $device['device_id'] . '/events/">
+    <img src="images/16/report_magnify.png" align="absmiddle" border="0" /> Events
   </a>
-</li>");
+</li>');
 
-if($config['enable_syslog']) { echo("
-<li class=" . $select['syslog'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/syslog/'>
-    <img src='images/16/printer.png' align=absmiddle border=0> Syslog
+if($config['enable_syslog']) { 
+echo("<li class=" . $select['syslog'] . '">
+  <a href="'.$config['base_url']."/device/" . $device['device_id'] . '/syslog/">
+    <img src="images/16/printer.png" align="absmiddle" border="0" /> Syslog
   </a>
 </li>
-"); }
+'); 
+}
 
 if($_SESSION[userlevel] >= "5" && is_file($config['rancid_configs'] . $device['hostname'])) {
-  echo("
-<li class=" . $select['showconfig'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/showconfig/'>
-    <img src='images/16/page_white_text.png' align=absmiddle border=0> Config
+  echo('<li class=' . $select['showconfig'] . '">
+  <a href="'.$config['base_url']."/device/" . $device['device_id'] . '/showconfig/">
+    <img src="images/16/page_white_text.png" align="absmiddle" border="0" /> Config
   </a>
 </li>
-");
+');
 }
 
 if($_SESSION[userlevel] >= "5") {
-  echo("
-<li class=" . $select['edit'] . ">
-  <a href='".$config['base_url']."/device/" . $device['device_id'] . "/edit/'>
-    <img src='images/16/server_edit.png' align=absmiddle border=0> Settings
+  echo('<li class="' . $select['edit'] . '">
+  <a href="'.$config['base_url']."/device/" . $device['device_id'] . '/edit/">
+    <img src="images/16/server_edit.png" align="absmiddle" border="0" /> Settings
   </a>
 </li>
-");
+');
 }
 
 
 echo("</ul>");
-echo("
-<div class=contentstyle>");
+echo('
+<div class="contentstyle">');
 
 include("pages/device/".mres($section).".inc.php");
 
diff --git a/includes/functions.php b/includes/functions.php
index bc4f51882..7bfeffd40 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -340,13 +340,13 @@ global $config;
 $sql = "SELECT * FROM `devices` WHERE `device_id` = '$host'";
 $data = mysql_fetch_array(mysql_query($sql));
 $type = strtolower($data['os']);
-  if(file_exists($config['html_dir'] . "/images/os/$type" . ".png")){ $image = "<img src='".$config['base_url']."/images/os/$type.png'>";
-  } elseif(file_exists($config['html_dir'] . "/images/os/$type" . ".gif")){ $image = "<img src='".$config['base_url']."/images/os/$type.gif'>"; }
+  if(file_exists($config['html_dir'] . "/images/os/$type" . ".png")){ $image = "<img src='".$config['base_url']."/images/os/$type.png' />";
+  } elseif(file_exists($config['html_dir'] . "/images/os/$type" . ".gif")){ $image = "<img src='".$config['base_url']."/images/os/$type.gif' />"; }
   if($type == "linux") {
     $features = strtolower(trim($data['features']));
     list($distro) = split(" ", $features);
-    if(file_exists($config['html_dir'] . "/images/os/$distro" . ".png")){ $image = "<img src='".$config['base_url']."/images/os/$distro" . ".png'>";
-    } elseif(file_exists($config['html_dir'] . "/images/os/$distro" . ".gif")){ $image = "<img src='".$config['base_url']."/images/os/$distro" . ".gif'>"; }
+    if(file_exists($config['html_dir'] . "/images/os/$distro" . ".png")){ $image = "<img src='".$config['base_url']."/images/os/$distro" . ".png' />";
+    } elseif(file_exists($config['html_dir'] . "/images/os/$distro" . ".gif")){ $image = "<img src='".$config['base_url']."/images/os/$distro" . ".gif' />"; }
   }
   return $image;
 }