From d54df316acbe9be6163d78fdf8da9ee05566fb74 Mon Sep 17 00:00:00 2001
From: Geert Hauwaerts <geert@localhost>
Date: Sun, 21 Feb 2010 17:02:20 +0000
Subject: [PATCH] - Added a utility function formatCiscoHardware()   Params: -
 A reference to the $device array.           - An optional (true) if you want
 the platform only (and not the part number) - In device overview place
 Hardware before Operating System (makes more sence) - Added virtual
 $device['hardware'] for Cisco platforms without an hardware tag (like Cisco
 3750)

git-svn-id: http://www.observium.org/svn/observer/trunk@925 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/dev-overview-data.inc.php | 16 ++++++++--------
 html/includes/hostbox.inc               |  2 +-
 includes/defaults.inc.php               |  2 ++
 includes/functions.php                  | 22 +++++++++++++++++++++-
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/html/includes/dev-overview-data.inc.php b/html/includes/dev-overview-data.inc.php
index f99ea77f0..70909db70 100644
--- a/html/includes/dev-overview-data.inc.php
+++ b/html/includes/dev-overview-data.inc.php
@@ -7,30 +7,30 @@
 #  $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")) {
     $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")) {
     $dev_img = "<div style='float: left;'><img src='images/devices/" . $device['hardware'] . ".jpg' align=absmiddle></img></div>";
   } else { unset($dev_img); }
 
-  
 
+    if ($device['os'] == "ios") { formatCiscoHardware($device); }
     if ($device['features']) { $device['features'] = "(".$device['features'].")"; }
     $device['os_text'] = $os_text[$device[os]];
 
     echo("$ddev_img
-      <table width=100%>
-        <tr>
-          <td class=list-bold>Operating System</td>
-          <td>" . $device['os_text'] . " " . $device['version'] . " " . $device['features'] . " </td>
-        </tr>");
-	
+      <table width=100%>");
+
     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>");
+
     if($device['sysContact']) {echo("<tr>
           <td class=list-bold>Contact</td>
           <td>" . htmlspecialchars($device['sysContact']). "</td>
diff --git a/html/includes/hostbox.inc b/html/includes/hostbox.inc
index 3938e28d2..f7e56c61a 100644
--- a/html/includes/hostbox.inc
+++ b/html/includes/hostbox.inc
@@ -11,7 +11,7 @@
    unset($image);
 
    $image = getImage($device['device_id']);
-
+   if ($device['os'] == "ios") { formatCiscoHardware($device, true); }
    $device['os_text'] = $os_text[$device['os']]; 
 
    echo('  <tr background="'.$bg_image.'" bgcolor="' . $bg . '" onmouseover="this.style.backgroundColor=\'#fdd\';" onmouseout="this.style.backgroundColor=\'' . $bg . '\';" 
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index b3b34e5f0..ee3ffdb41 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -50,6 +50,8 @@ $config['graph_colours']['blues']   = array('A0A0E5','8080BD','606096','40406F',
 $config['graph_colours']['purples'] = array('CC7CCC','AF63AF','934A93','773177','5B185B','3F003F');
 $config['graph_colours']['default'] = $config['graph_colours']['blues'];
 
+### The device overview page options
+
 $config['overview_show_sysDescr'] = true;
 
 ### Ignores & Allows
diff --git a/includes/functions.php b/includes/functions.php
index 8d7c8a471..a5d25914d 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -835,5 +835,25 @@ function notify($device,$title,$message)
   if ($device['sysContact']) { $email = $device['sysContact']; } else { $email = $config['email_default']; }
   mail($email, $title, $message, $config['email_headers']);
 }
-                                                                                                                                
+
+
+function formatCiscoHardware(&$device, $short = false)
+{
+
+    if ($device['os'] == "ios") {
+        if ($device['hardware']) {
+            if (preg_match("/^WS-C([A-Za-z0-9]+).*/", $device['hardware'], $matches)) {
+                if (!$short) {
+                    $device['hardware'] = "Cisco " . $matches[1] . " (" . $device['hardware'] . ")";
+                } else {
+                    $device['hardware'] = "Cisco " . $matches[1];
+                }
+            }
+        } else {
+            if (preg_match("/Cisco IOS Software, C([A-Za-z0-9]+) Software.*/", $device['sysDescr'], $matches)) {
+                $device['hardware'] = "Cisco " . $matches[1];
+            }
+        }
+    }
+}
 ?>