From 88a6146d5ef88795e710ec0bf637c05abcdee102 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Fri, 23 Sep 2016 22:30:53 +0100
Subject: [PATCH] Some small updates to if() if()

---
 includes/discovery/os/netgear.inc.php      |  4 +---
 includes/discovery/os/netmanplus.inc.php   |  4 +---
 includes/discovery/os/powerconnect.inc.php | 16 +++++-----------
 includes/discovery/os/prestige.inc.php     |  4 +---
 includes/discovery/os/procurve.inc.php     |  4 +---
 5 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/includes/discovery/os/netgear.inc.php b/includes/discovery/os/netgear.inc.php
index 29faccd37f..c8f27f5d20 100644
--- a/includes/discovery/os/netgear.inc.php
+++ b/includes/discovery/os/netgear.inc.php
@@ -2,8 +2,6 @@
 
 if (str_contains($sysDescr, 'ProSafe')) {
     $os = 'netgear';
-}
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.4526')) {
+} elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.4526')) {
     $os = 'netgear';
 }
diff --git a/includes/discovery/os/netmanplus.inc.php b/includes/discovery/os/netmanplus.inc.php
index 43fc7a0a81..ae89fe20a4 100644
--- a/includes/discovery/os/netmanplus.inc.php
+++ b/includes/discovery/os/netmanplus.inc.php
@@ -2,8 +2,6 @@
 
 if (starts_with($sysDescr, 'NetMan') && str_contains($sysDescr, 'plus')) {
     $os = 'netmanplus';
-}
-
-if (starts_with($sysObjectId, '.1.3.6.1.4.1.5491.6')) {
+} elseif (starts_with($sysObjectId, '.1.3.6.1.4.1.5491.6')) {
     $os = 'netmanplus';
 }
diff --git a/includes/discovery/os/powerconnect.inc.php b/includes/discovery/os/powerconnect.inc.php
index 3cc2d42f42..1d661cc391 100644
--- a/includes/discovery/os/powerconnect.inc.php
+++ b/includes/discovery/os/powerconnect.inc.php
@@ -2,16 +2,10 @@
 
 if (str_contains($sysDescr, 'PowerConnect') && !str_contains($sysDescr, 'ArubaOS')) {
     $os = 'powerconnect';
-}
-
-if (str_contains($sysDescr, 'Neyland 24T')) {
-    $os = 'powerconnect';
-}
-
-if (str_contains($sysDescr, 'Dell', true) && str_contains($sysDescr, 'Gigabit Ethernet', true)) {
-    $os = 'powerconnect';
-}
-
-if (str_contains(snmp_get($device, '.1.3.6.1.4.1.674.10895.3000.1.2.100.1.0', '-Oqv', ''), 'PowerConnect')) {
+} elseif (str_contains($sysDescr, 'Neyland 24T')) {
+    $os = 'powerconnect';
+} elseif (str_contains($sysDescr, 'Dell', true) && str_contains($sysDescr, 'Gigabit Ethernet', true)) {
+    $os = 'powerconnect';
+} elseif (str_contains(snmp_get($device, '.1.3.6.1.4.1.674.10895.3000.1.2.100.1.0', '-Oqv', ''), 'PowerConnect', true)) {
     $os = 'powerconnect';
 }
diff --git a/includes/discovery/os/prestige.inc.php b/includes/discovery/os/prestige.inc.php
index e2bd6f6529..bb5a2d363a 100644
--- a/includes/discovery/os/prestige.inc.php
+++ b/includes/discovery/os/prestige.inc.php
@@ -2,8 +2,6 @@
 
 if (starts_with($sysDescr, array('Prestige '))) {
     $os = 'prestige';
-}
-
-if (preg_match('/^P-.*-/', $sysDescr)) {
+} elseif (preg_match('/^P-.*-/', $sysDescr)) {
     $os = 'prestige';
 }
diff --git a/includes/discovery/os/procurve.inc.php b/includes/discovery/os/procurve.inc.php
index e9612880f9..a5715dc21c 100644
--- a/includes/discovery/os/procurve.inc.php
+++ b/includes/discovery/os/procurve.inc.php
@@ -2,9 +2,7 @@
 
 if (str_contains($sysDescr, array('ProCurve', 'HP 1820'))) {
     $os = 'procurve';
-}
-
-if (preg_match('/eCos-[0-9.]+/', $sysDescr)) {
+} elseif (preg_match('/eCos-[0-9.]+/', $sysDescr)) {
     $os = 'procurve';
 } elseif (preg_match('/HP(.+)2530(.+)/', $sysDescr)) {
     $os = 'procurve';