finished n to r

includes/discovery/os/netapp.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (stristr($sysDescr, 'NetApp')) {
-        $os = 'netapp';
-    }
+if (str_contains($sysDescr, 'NetApp')) {
+    $os = 'netapp';
 }

includes/discovery/os/netbsd.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^NetBSD/', $sysDescr)) {
-        $os = 'netbsd';
-    }
+if (starts_with($sysDescr, 'NetBSD')) {
+    $os = 'netbsd';
 }

includes/discovery/os/netgear.inc.php

@@ -1,9 +1,9 @@
 <?php
 
-if (!$os) {
-    if (stristr($sysDescr, 'ProSafe')) {
-        $os = 'netgear';
-    } elseif (strpos($sysObjectId, '1.3.6.1.4.1.4526') !== false) {
-        $os = 'netgear';
-    }
+if (str_contains($sysDescr, 'ProSafe')) {
+    $os = 'netgear';
+}
+
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.4526')) {
+    $os = 'netgear';
 }

includes/discovery/os/netmanplus.inc.php

@@ -1,11 +1,9 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^NetMan.*plus/', $sysDescr)) {
-        $os = 'netmanplus';
-    }
-
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.5491.6')) {
-        $os = 'netmanplus';
-    }
+if (starts_with($sysDescr, 'NetMan') && str_contains($sysDescr, 'plus')) {
+    $os = 'netmanplus';
+}
+
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.5491.6')) {
+    $os = 'netmanplus';
 }

includes/discovery/os/netonix.inc.php

@@ -11,8 +11,6 @@
    * the source code distribution for details.
    */
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.46242')) {
-        $os = 'netonix';
-    }
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.46242')) {
+    $os = 'netonix';
 }

includes/discovery/os/netopia.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^Netopia /', $sysDescr)) {
-        $os = 'netopia';
-    }
+if (starts_with($sysDescr, 'Netopia')) {
+    $os = 'netopia';
 }

includes/discovery/os/netscaler.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.5951.1')) {
-        $os = 'netscaler';
-    }
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.5951.1')) {
+    $os = 'netscaler';
 }

includes/discovery/os/netvision.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^Net Vision/', $sysDescr)) {
-        $os = 'netvision';
-    }
+if (starts_with($sysDescr, 'Net Vision')) {
+    $os = 'netvision';
 }

includes/discovery/os/netware.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysDescr, 'Novell NetWare')) {
-        $os = 'netware';
-    }
+if (str_contains($sysDescr, 'Novell NetWare')) {
+    $os = 'netware';
 }

includes/discovery/os/nimbleos.inc.php

@@ -9,9 +9,7 @@
  * option) any later version.  Please see LICENSE.txt at the top level of
  * the source code distribution for details.
  */
- 
-if (!$os) {
-    if (str_contains($sysDescr, 'Nimble Storage')) {
-        $os = 'nimbleos';
-    }
+
+if (str_contains($sysDescr, 'Nimble Storage')) {
+    $os = 'nimbleos';
 }

includes/discovery/os/nios.inc.php

@@ -1,6 +1,5 @@
 <?php
-if (!$os) {
-    if (starts_with($sysObjectId, '.1.3.6.1.4.1.7779.')) {
-        $os = 'nios';
-    }
+
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.7779.')) {
+    $os = 'nios';
 }

includes/discovery/os/nitro.inc.php

@@ -1,14 +1,5 @@
 <?php
 
-// MaAfee SIEM Nitro
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.23128.1000.1.1')) {
-        $os = 'nitro';
-    } elseif (strstr($sysObjectId, '.1.3.6.1.4.1.23128.1000.3.1')) {
-        $os = 'nitro';
-    } elseif (strstr($sysObjectId, '.1.3.6.1.4.1.23128.1000.7.1')) {
-        $os = 'nitro';
-    } elseif (strstr($sysObjectId, '.1.3.6.1.4.1.23128.1000.11.1')) {
-        $os = 'nitro';
-    }
+if (starts_with($sysObjectId, array('.1.3.6.1.4.1.23128.1000.1.1', '.1.3.6.1.4.1.23128.1000.3.1', '.1.3.6.1.4.1.23128.1000.7.1', '.1.3.6.1.4.1.23128.1000.11.1'))) {
+    $os = 'nitro';
 }

includes/discovery/os/nos.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysDescr, "Brocade VDX")||strstr($sysDescr, "BR-VDX")||strstr($sysDescr, "VDX67")) {
-        $os = "nos";
-    }
+if (str_contains($sysDescr, array('Brocade VDX', 'BR-VDX', 'VDX67'))) {
+    $os = 'nos';
 }

includes/discovery/os/nrg.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysDescr, 'NRG Network Printer')) {
-        $os = 'nrg';
-    }
+if (str_contains($sysDescr, 'NRG Network Printer')) {
+    $os = 'nrg';
 }

includes/discovery/os/nxos.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysDescr, 'NX-OS(tm)')) {
-        $os = 'nxos';
-    }
+if (str_contains($sysDescr, 'NX-OS(tm)')) {
+    $os = 'nxos';
 }

includes/discovery/os/okilan.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysDescr, 'OKI OkiLAN')) {
-        $os = 'okilan';
-    }
+if (str_contains($sysDescr, 'OKI OkiLAN')) {
+    $os = 'okilan';
 }

includes/discovery/os/onefs.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.12124.1')) {
-        $os = 'onefs';
-    }
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.12124.1')) {
+    $os = 'onefs';
 }

includes/discovery/os/ons.inc.php

@@ -1,6 +1,5 @@
 <?php
-if (!$os) {
-    if (str_contains($sysDescr, 'Cisco ONS')) {
-        $os = 'ons';
-    }
+
+if (str_contains($sysDescr, 'Cisco ONS')) {
+    $os = 'ons';
 }

includes/discovery/os/openbsd.inc.php

@@ -1,10 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.30155.23.1')) {
-        $os = 'openbsd';
-    } //end if
-    if (preg_match('/OpenBSD/', $sysDescr)) {
-        $os = 'openbsd';
-    } //end if
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.30155.23.1') || str_contains($sysDescr, 'OpenBSD')) {
+    $os = 'openbsd';
 }

includes/discovery/os/oracle-ilom.inc.php

@@ -10,8 +10,6 @@
  * the source code distribution for details.
  */
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.42.2.200.2.1.1')) {
-        $os = 'oracle-ilom';
-    }
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.42.2.200.2.1.1')) {
+    $os = 'oracle-ilom';
 }

includes/discovery/os/packetshaper.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysDescr, 'PacketShaper')) {
-        $os = 'packetshaper';
-    }
+if (str_contains($sysDescr, 'PacketShaper')) {
+    $os = 'packetshaper';
 }

includes/discovery/os/panos.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysDescr, 'Palo Alto Networks')) {
-        $os = 'panos';
-    }
+if (str_contains($sysDescr, 'Palo Alto Networks')) {
+    $os = 'panos';
 }

includes/discovery/os/papouch-tme.inc.php

@@ -1,9 +1,5 @@
 <?php
 
-if (!$os) {
-    if ($sysDescr == 'SNMP TME') {
-        $os = 'papouch-tme';
-    } elseif ($sysDescr == 'TME') {
-        $os = 'papouch-tme';
-    }
+if (str_contains($sysDescr, array('SNMP TME', 'TME'))) {
+    $os = 'papouch-tme';
 }

includes/discovery/os/pbn.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.11606')) {
-        $os = 'pbn';
-    }
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.11606')) {
+    $os = 'pbn';
 }

includes/discovery/os/perle.inc.php

@@ -9,8 +9,7 @@
  * option) any later version.  Please see LICENSE.txt at the top level of
  * the source code distribution for details.
  */
-if (!$os) {
-    if (stristr($sysDescr, 'Perle MCR-MGT')) {
-        $os = 'perle';
-    }
+
+if (str_contains($sysDescr, 'Perle MCR-MGT')) {
+    $os = 'perle';
 }

includes/discovery/os/pix.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/Cisco\ PIX/', $sysDescr)) {
-        $os = 'pixos';
-    }
+if (str_contains($sysDescr, 'Cisco PIX')) {
+    $os = 'pixos';
 }

includes/discovery/os/planetos.inc.php

@@ -9,9 +9,7 @@
  * option) any later version.  Please see LICENSE.txt at the top level of
  * the source code distribution for details.
  */
- 
-if (!$os) {
-    if (str_contains($sysObjectId, '1.3.6.1.4.1.10456.1.1516')) {
-        $os = 'planetos';
-    }
+
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.10456.1.1516')) {
+    $os = 'planetos';
 }

includes/discovery/os/poweralert.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^POWERALERT/i', $sysDescr)) {
-        $os = 'poweralert';
-    }
+if (starts_with($sysDescr, 'POWERALERT')) {
+    $os = 'poweralert';
 }

includes/discovery/os/powercode.inc.php

@@ -12,9 +12,6 @@
  * the source code distribution for details.
  */
 
-// sysDescr.0 = STRING: Powercode BMU
-if (!$os) {
-    if (stristr($sysDescr, 'Powercode BMU')) {
-        $os = 'powercode';
-    }
+if (str_contains($sysDescr, 'Powercode BMU')) {
+    $os = 'powercode';
 }

includes/discovery/os/powerconnect.inc.php

@@ -1,14 +1,17 @@
 <?php
 
-if (!$os) {
-    if (stristr($sysDescr, 'PowerConnect ') && !stristr($sysDescr, 'ArubaOS')) {
-        $os = 'powerconnect';
-    } elseif (preg_match('/Dell.*Gigabit\ Ethernet/i', $sysDescr)) {
-        $os = 'powerconnect';
-    } elseif (strstr($sysDescr, 'Neyland 24T')) {
-        /* PowerConnect 5324 */
-        $os = 'powerconnect';
-    } elseif (stristr(snmp_get($device, '1.3.6.1.4.1.674.10895.3000.1.2.100.1.0', '-Oqv', ''), 'PowerConnect')) {
-        $os = 'powerconnect';
-    }
+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')) {
+    $os = 'powerconnect';
 }

includes/discovery/os/powervault.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.674.10893.2.102')) {
-        $os = 'powervault';
-    }
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.674.10893.2.102')) {
+    $os = 'powervault';
 }

includes/discovery/os/powerwalker.inc.php

@@ -9,8 +9,7 @@
  * option) any later version.  Please see LICENSE.txt at the top level of
  * the source code distribution for details.
  */
-if (!$os) {
-    if (strpos($sysObjectId, '.1.3.6.1.4.1.935.10') !== false && $sysDescr == 'Network Management Card for UPS') {
-        $os = 'powerwalker';
-    }
+
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.935.10') || str_contains($sysDescr, 'Network Management Card for UPS')) {
+    $os = 'powerwalker';
 }

includes/discovery/os/powerware.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.534')) {
-        $os = 'powerware';
-    }
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.534')) {
+    $os = 'powerware';
 }

includes/discovery/os/prestige.inc.php

@@ -1,10 +1,5 @@
 <?php
 
-if (!$os) {
-    if (preg_match('/^Prestige \d/', $sysDescr)) {
-        $os = 'prestige';
-    }
-    if (preg_match('/^P-.*-/', $sysDescr)) {
-        $os = 'prestige';
-    }
+if (starts_with($sysDescr, array('Prestige ', 'P-'))) {
+    $os = 'prestige';
 }

includes/discovery/os/primeinfrastructure.inc.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!$os) {
-    if (strstr($sysObjectId, '.1.3.6.1.4.1.9.1.2307')) {
-        $os = 'primeinfrastructure';
-    }
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.9.1.2307')) {
+    $os = 'primeinfrastructure';
 }

includes/discovery/os/procurve.inc.php

@@ -4,16 +4,10 @@ if (str_contains($sysDescr, array('ProCurve', 'HP 1820'))) {
     $os = 'procurve';
 }
 
-if (!$os) {
-    if (stristr($sysDescr, 'ProCurve') || stristr($sysDescr, 'HP 1820')) {
-        $os = 'procurve';
-    } elseif (preg_match('/eCos-[0-9.]+/', $sysDescr)) {
-        $os = 'procurve';
-    } elseif (preg_match('/HP(.+)2530(.+)/', $sysDescr)) {
-        //hp aruba 2530 series
-        $os = 'procurve';
-    } elseif (preg_match('/HP(.+)54[0-1][2-6]R(.+)/', $sysDescr)) {
-        //hp aruba 5406R and 5412R series
-        $os = 'procurve';
-    }
+if (str_contains($sysDescr, 'HP') && str_contains($sysDescr, array('2530', '54'))) {
+    $os = 'procurve';
+}
+
+if (str_contains($sysDescr, 'eCos-')) {
+    $os = 'procurve';
 }