From 583043a6c46c124dbe7ca5d0a761a41dbbc3bab7 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Tue, 10 Mar 2015 00:06:09 +0000
Subject: [PATCH] Merged hp and comware poll/disco

---
 includes/definitions.inc.php          | 6 ------
 includes/discovery/os/comware.inc.php | 1 +
 includes/discovery/os/hp.inc.php      | 8 --------
 includes/polling/os/comware.inc.php   | 3 +++
 includes/polling/os/hp.inc.php        | 6 ------
 5 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 includes/discovery/os/hp.inc.php
 delete mode 100644 includes/polling/os/hp.inc.php

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index da11b6013..bb202a28e 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -982,12 +982,6 @@ $config['os'][$os]['text']              = "Hikvision";
 $config['os'][$os]['type']              = "network";
 $config['os'][$os]['icon']              = "hikvision";
 
-$os = "hp";
-$config['os'][$os]['text']              = "HP";
-$config['os'][$os]['over'][0]['graph']  = "device_bits";
-$config['os'][$os]['over'][0]['text']   = "Traffic";
-$config['os'][$os]['type']              = "network";
-
 foreach ($config['os'] as $this_os => $blah)
 {
   if (isset($config['os'][$this_os]['group']))
diff --git a/includes/discovery/os/comware.inc.php b/includes/discovery/os/comware.inc.php
index d2b019022..94f0f7f15 100644
--- a/includes/discovery/os/comware.inc.php
+++ b/includes/discovery/os/comware.inc.php
@@ -3,6 +3,7 @@
 if (!$os)
 {
   if (strstr($sysDescr, "Comware")) { $os = "comware"; }
+  else if(preg_match('/HP [a-zA-Z0-9-]+ Switch Software Version/',$sysDescr)) { $os = "comware"; }
 }
 
 ?>
diff --git a/includes/discovery/os/hp.inc.php b/includes/discovery/os/hp.inc.php
deleted file mode 100644
index 2683d0a45..000000000
--- a/includes/discovery/os/hp.inc.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if (!$os)
-{
-  if(preg_match('/HP [a-zA-Z0-9-]+ Switch Software Version/',$sysDescr)) { $os = "hp"; }
-}
-
-?>
diff --git a/includes/polling/os/comware.inc.php b/includes/polling/os/comware.inc.php
index 23fe2867e..51470977a 100644
--- a/includes/polling/os/comware.inc.php
+++ b/includes/polling/os/comware.inc.php
@@ -12,5 +12,8 @@ $hardware = snmp_get($device, "sysObjectID.0", "-OQsv", "SNMPv2-MIB:HH3C-PRODUCT
 list(,$version,$features) = explode(",", $poll_device['sysDescr']);
 list(,,,$version) = explode(" ", $version);
 list(,,$features) = explode(" ", $features);
+if (empty($version)) {
+    list($version) = explode("\r", substr($poll_device['sysDescr'], strpos($poll_device['sysDescr'], "Release")+8));
+}
 
 ?>
diff --git a/includes/polling/os/hp.inc.php b/includes/polling/os/hp.inc.php
deleted file mode 100644
index 552544886..000000000
--- a/includes/polling/os/hp.inc.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-# Version is the last word in the sysDescr's first line
-list($version) = explode("\r", substr($poll_device['sysDescr'], strpos($poll_device['sysDescr'], "Release")+8));
- 
-?>