From c00959e44bccac122c18bdf70861c7e4ec05bee6 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Mon, 14 Mar 2011 19:16:40 +0000
Subject: [PATCH] code cleanup/reformat os discovery files

git-svn-id: http://www.observium.org/svn/observer/trunk@1833 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/os/3com.inc.php          | 11 +++++------
 includes/discovery/os/adva.inc.php          |  4 ++--
 includes/discovery/os/airport.inc.php       | 13 ++++++-------
 includes/discovery/os/akcp.inc.php          |  7 +++----
 includes/discovery/os/allied.inc.php        | 12 +++++-------
 includes/discovery/os/apc.inc.php           | 16 +++++++---------
 includes/discovery/os/areca.inc.php         |  9 ++++-----
 includes/discovery/os/arista-eos.inc.php    |  9 ++++-----
 includes/discovery/os/asa.inc.php           |  7 ++++---
 includes/discovery/os/axiscam.inc.php       |  7 +++----
 includes/discovery/os/axisdocserver.inc.php |  7 +++----
 includes/discovery/os/bcm963.inc.php        | 10 ++++------
 includes/discovery/os/brother.inc.php       |  7 +++----
 includes/discovery/os/cat1900.inc.php       |  9 ++++-----
 includes/discovery/os/catos.inc.php         |  9 ++++-----
 includes/discovery/os/dell-laser.inc.php    | 13 ++++++-------
 includes/discovery/os/deltaups.inc.php      |  4 ++--
 includes/discovery/os/dlink.inc.php         |  7 +++----
 includes/discovery/os/dlinkap.inc.php       |  7 +++----
 includes/discovery/os/drac.inc.php          |  9 ++++-----
 includes/discovery/os/engenius.inc.php      |  5 ++---
 includes/discovery/os/extremeware.inc.php   | 12 +++++-------
 includes/discovery/os/fortigate.inc.php     | 11 +++++------
 includes/discovery/os/freebsd.inc.php       | 12 +++++++-----
 includes/discovery/os/ftos.inc.php          |  9 ++++-----
 includes/discovery/os/gamatronicups.inc.php | 18 ++++++++++--------
 includes/discovery/os/ies.inc.php           | 10 ++++------
 includes/discovery/os/ios.inc.php           | 17 ++++++++---------
 includes/discovery/os/ipoman.inc.php        |  4 ++--
 includes/discovery/os/ironware.inc.php      |  7 ++++---
 includes/discovery/os/jetdirect.inc.php     | 13 ++++++-------
 includes/discovery/os/junos.inc.php         |  9 ++++-----
 includes/discovery/os/junose.inc.php        |  9 ++++-----
 includes/discovery/os/jwos.inc.php          |  9 ++++-----
 includes/discovery/os/konica.inc.php        |  9 ++++-----
 includes/discovery/os/kyocera.inc.php       |  9 ++++-----
 includes/discovery/os/linksys.inc.php       |  3 ---
 includes/discovery/os/linux.inc.php         |  7 ++++---
 includes/discovery/os/m0n0wall.inc.php      |  4 ----
 includes/discovery/os/mgepdu.inc.php        |  9 ++++-----
 includes/discovery/os/mgeups.inc.php        |  6 +++---
 includes/discovery/os/netbsd.inc.php        |  7 ++++---
 includes/discovery/os/netmanplus.inc.php    |  7 +++----
 includes/discovery/os/netopia.inc.php       |  7 +++----
 includes/discovery/os/netware.inc.php       |  9 ++++-----
 includes/discovery/os/nxos.inc.php          |  9 ++++-----
 includes/discovery/os/okilan.inc.php        |  9 ++++-----
 includes/discovery/os/openbsd.inc.php       |  7 ++++---
 includes/discovery/os/packetshaper.inc.php  |  9 ++++-----
 includes/discovery/os/papouch-tme.inc.php   | 11 +++++------
 includes/discovery/os/powerconnect.inc.php  |  2 +-
 includes/discovery/os/powervault.inc.php    |  9 ++++-----
 includes/discovery/os/powerware.inc.php     |  5 ++---
 includes/discovery/os/prestige.inc.php      |  7 +++----
 includes/discovery/os/procurve.inc.php      | 10 ++++------
 includes/discovery/os/radlan.inc.php        |  2 +-
 includes/discovery/os/redback.inc.php       |  7 ++++---
 includes/discovery/os/ricoh.inc.php         |  9 ++++-----
 includes/discovery/os/routeros.inc.php      | 18 ++++++++++--------
 includes/discovery/os/sanos.inc.php         |  9 ++++-----
 includes/discovery/os/screenos.inc.php      |  7 +++----
 includes/discovery/os/solaris.inc.php       | 13 +++++++------
 includes/discovery/os/sonicwall.inc.php     |  2 +-
 includes/discovery/os/speedtouch.inc.php    | 11 +++++------
 includes/discovery/os/tranzeo.inc.php       |  8 ++++----
 includes/discovery/os/vrp.inc.php           | 13 ++++++-------
 includes/discovery/os/vyatta.inc.php        |  7 ++++---
 includes/discovery/os/windows.inc.php       |  8 ++++----
 includes/discovery/os/wxgoos.inc.php        |  7 +++----
 includes/discovery/os/xerox.inc.php         | 11 +++++------
 includes/discovery/os/zywall.inc.php        | 10 ++++------
 includes/discovery/os/zyxeles.inc.php       |  7 +++----
 72 files changed, 288 insertions(+), 338 deletions(-)
 delete mode 100755 includes/discovery/os/linksys.inc.php
 delete mode 100755 includes/discovery/os/m0n0wall.inc.php

diff --git a/includes/discovery/os/3com.inc.php b/includes/discovery/os/3com.inc.php
index 19c3ff6c7..1993f80f0 100644
--- a/includes/discovery/os/3com.inc.php
+++ b/includes/discovery/os/3com.inc.php
@@ -1,10 +1,9 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "3Com Switch ")) { $os = "3com"; }
-  else if(strstr($sysDescr, "3Com SuperStack")) { $os = "3com"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "3Com Switch ")) { $os = "3com"; }
+  else if (strstr($sysDescr, "3Com SuperStack")) { $os = "3com"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/adva.inc.php b/includes/discovery/os/adva.inc.php
index 493f900a0..dd6009687 100755
--- a/includes/discovery/os/adva.inc.php
+++ b/includes/discovery/os/adva.inc.php
@@ -1,8 +1,8 @@
 <?php
 
-if(!$os) 
+if (!$os) 
 {
   if (strstr($sysObjectId, ".1.3.6.1.4.1.1671")) { $os = "adva"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/airport.inc.php b/includes/discovery/os/airport.inc.php
index 5dbd65a04..e20f256ce 100644
--- a/includes/discovery/os/airport.inc.php
+++ b/includes/discovery/os/airport.inc.php
@@ -1,11 +1,10 @@
 <?php
 
-if(!$os) {
-
-  if(strpos($sysDescr, "Apple AirPort") !== FALSE) { $os = "airport"; }
-  else if(strpos($sysDescr, "Apple Base Station") !== FALSE) { $os = "airport"; }
-  else if(strpos($sysDescr, "Base Station V3.84") !== FALSE) { $os = "airport"; }
-
+if (!$os)
+{
+  if (strpos($sysDescr, "Apple AirPort") !== FALSE) { $os = "airport"; }
+  else if (strpos($sysDescr, "Apple Base Station") !== FALSE) { $os = "airport"; }
+  else if (strpos($sysDescr, "Base Station V3.84") !== FALSE) { $os = "airport"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/akcp.inc.php b/includes/discovery/os/akcp.inc.php
index 7bd573e18..1fa39310e 100644
--- a/includes/discovery/os/akcp.inc.php
+++ b/includes/discovery/os/akcp.inc.php
@@ -1,10 +1,9 @@
 <?php
 
-if (!$os) {
-
+if (!$os)
+{
   if (preg_match("/8VD-X20/", $sysDescr)) { $os = "minkelsrms"; }
   if (preg_match("/SensorProbe/i", $sysDescr)) { $os = "akcp"; }
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/allied.inc.php b/includes/discovery/os/allied.inc.php
index 803377c44..582b57dc0 100755
--- a/includes/discovery/os/allied.inc.php
+++ b/includes/discovery/os/allied.inc.php
@@ -1,11 +1,9 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysObjectId, ".1.3.6.1.4.1.207")) { $os = "allied"; }
-
-  if(strstr($sysObjectId, ".1.3.6.1.4.1.207.1.4.126")) { unset($os);  }
-
+if (!$os)
+{
+  if (strstr($sysObjectId, ".1.3.6.1.4.1.207")) { $os = "allied"; }
+  if (strstr($sysObjectId, ".1.3.6.1.4.1.207.1.4.126")) { unset($os);  }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/apc.inc.php b/includes/discovery/os/apc.inc.php
index 169f7a349..0c2ab869e 100644
--- a/includes/discovery/os/apc.inc.php
+++ b/includes/discovery/os/apc.inc.php
@@ -1,13 +1,11 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "APC Web/SNMP Management Card")) { $os = "apc"; }
-  else if(strstr($sysDescr, "APC Switched Rack PDU")) { $os = "apc"; }
-  else if(strstr($sysDescr, "APC MasterSwitch PDU")) { $os = "apc"; }
-  else if(strstr($sysDescr, "APC Metered Rack PDU")) { $os = "apc"; }
-
-
+if (!$os)
+{
+  if (strstr($sysDescr, "APC Web/SNMP Management Card")) { $os = "apc"; }
+  elseif (strstr($sysDescr, "APC Switched Rack PDU")) { $os = "apc"; }
+  elseif (strstr($sysDescr, "APC MasterSwitch PDU")) { $os = "apc"; }
+  elseif (strstr($sysDescr, "APC Metered Rack PDU")) { $os = "apc"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/areca.inc.php b/includes/discovery/os/areca.inc.php
index fe86346e3..e289fdea8 100755
--- a/includes/discovery/os/areca.inc.php
+++ b/includes/discovery/os/areca.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "Raid Subsystem V")) { $os = "areca"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "Raid Subsystem V")) { $os = "areca"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/arista-eos.inc.php b/includes/discovery/os/arista-eos.inc.php
index c4edf1e5b..8c1e4ef1a 100755
--- a/includes/discovery/os/arista-eos.inc.php
+++ b/includes/discovery/os/arista-eos.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "Arista Networks EOS")) { $os = "arista_eos"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "Arista Networks EOS")) { $os = "arista_eos"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/asa.inc.php b/includes/discovery/os/asa.inc.php
index fcec461c9..633687ec5 100755
--- a/includes/discovery/os/asa.inc.php
+++ b/includes/discovery/os/asa.inc.php
@@ -1,7 +1,8 @@
 <?php
 
-if(!$os) {
-  if(preg_match("/^Cisco\ Adaptive\ Security\ Appliance/", $sysDescr)) { $os = "asa"; }
+if (!$os)
+{
+  if (preg_match("/^Cisco\ Adaptive\ Security\ Appliance/", $sysDescr)) { $os = "asa"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/axiscam.inc.php b/includes/discovery/os/axiscam.inc.php
index b366fb9e9..86923adc1 100644
--- a/includes/discovery/os/axiscam.inc.php
+++ b/includes/discovery/os/axiscam.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if (!$os) {
-
+if (!$os)
+{
   if (preg_match("/AXIS.*Network Camera/", $sysDescr)) { $os = "axiscam"; }
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/axisdocserver.inc.php b/includes/discovery/os/axisdocserver.inc.php
index e1b9bbd3b..f6b25b84e 100644
--- a/includes/discovery/os/axisdocserver.inc.php
+++ b/includes/discovery/os/axisdocserver.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if (!$os) {
-
+if (!$os)
+{
   if (preg_match("/^AXIS .* Network Document Server/", $sysDescr)) { $os = "axisdocserver"; }
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/bcm963.inc.php b/includes/discovery/os/bcm963.inc.php
index bf6998555..e0c721170 100644
--- a/includes/discovery/os/bcm963.inc.php
+++ b/includes/discovery/os/bcm963.inc.php
@@ -1,10 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(stripos($sysDescr, "bcm963") !== FALSE) { $os = "bcm963"; }
-
+if (!$os)
+{
+  if (stripos($sysDescr, "bcm963") !== FALSE) { $os = "bcm963"; }
 }
 
-
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/brother.inc.php b/includes/discovery/os/brother.inc.php
index 352554a4d..be6a4a6be 100644
--- a/includes/discovery/os/brother.inc.php
+++ b/includes/discovery/os/brother.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if (!$os) {
-
+if (!$os)
+{
   if (preg_match("/Brother NC-.*h,/", $sysDescr)) { $os = "brother"; }
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/cat1900.inc.php b/includes/discovery/os/cat1900.inc.php
index ddcab4448..d08f3cedf 100755
--- a/includes/discovery/os/cat1900.inc.php
+++ b/includes/discovery/os/cat1900.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "Cisco Systems Catalyst 1900")) { $os = "cat1900"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "Cisco Systems Catalyst 1900")) { $os = "cat1900"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/catos.inc.php b/includes/discovery/os/catos.inc.php
index 62c639a81..7a624e419 100755
--- a/includes/discovery/os/catos.inc.php
+++ b/includes/discovery/os/catos.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "Cisco Catalyst Operating System Software")) { $os = "catos"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "Cisco Catalyst Operating System Software")) { $os = "catos"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/dell-laser.inc.php b/includes/discovery/os/dell-laser.inc.php
index 6b4d3f5cf..daa90da14 100644
--- a/includes/discovery/os/dell-laser.inc.php
+++ b/includes/discovery/os/dell-laser.inc.php
@@ -1,11 +1,10 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "Dell Color Laser")) { $os = "dell-laser"; }
-  elseif(strstr($sysDescr, "Dell Laser Printer")) { $os = "dell-laser"; }
-  elseif(preg_match("/^Dell.*MFP/", $sysDescr)) { $os = "dell-laser"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "Dell Color Laser")) { $os = "dell-laser"; }
+  elseif (strstr($sysDescr, "Dell Laser Printer")) { $os = "dell-laser"; }
+  elseif (preg_match("/^Dell.*MFP/", $sysDescr)) { $os = "dell-laser"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/deltaups.inc.php b/includes/discovery/os/deltaups.inc.php
index 4edff54b1..1cf098e41 100644
--- a/includes/discovery/os/deltaups.inc.php
+++ b/includes/discovery/os/deltaups.inc.php
@@ -1,8 +1,8 @@
 <?php
 
-if(!$os) 
+if (!$os) 
 {
   if (strstr($sysObjectId, ".1.3.6.1.4.1.2254.2.4")) { $os = "deltaups"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/dlink.inc.php b/includes/discovery/os/dlink.inc.php
index d5852fc3c..26e9c78de 100644
--- a/includes/discovery/os/dlink.inc.php
+++ b/includes/discovery/os/dlink.inc.php
@@ -1,12 +1,11 @@
 <?php
 
-if (!$os) {
-
+if (!$os)
+{
   if (preg_match("/D-Link DES-/", $sysDescr)) { $os = "dlink"; }
   else if (preg_match("/Dlink DES-/", $sysDescr)) { $os = "dlink"; }
   else if (preg_match("/^DES-/", $sysDescr)) { $os = "dlink"; }
   else if (preg_match("/^DGS-/", $sysDescr)) { $os = "dlink"; }
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/dlinkap.inc.php b/includes/discovery/os/dlinkap.inc.php
index 62ed8ff36..4add24995 100644
--- a/includes/discovery/os/dlinkap.inc.php
+++ b/includes/discovery/os/dlinkap.inc.php
@@ -1,11 +1,10 @@
 <?php
 
-if (!$os) {
-
+if (!$os)
+{
   if (preg_match("/D-Link .* AP/", $sysDescr)) { $os = "dlinkap"; }
   else if (preg_match("/D-Link DAP-/", $sysDescr)) { $os = "dlinkap"; }
   else if (preg_match("/D-Link Access Point/", $sysDescr)) { $os = "dlinkap"; }
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/drac.inc.php b/includes/discovery/os/drac.inc.php
index 82e24cf0f..d1468e0bf 100644
--- a/includes/discovery/os/drac.inc.php
+++ b/includes/discovery/os/drac.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "Dell Out-of-band SNMP Agent for Remote Access Controller")) { $os = "drac"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "Dell Out-of-band SNMP Agent for Remote Access Controller")) { $os = "drac"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/engenius.inc.php b/includes/discovery/os/engenius.inc.php
index 7b9b1d9d8..5d14f9865 100644
--- a/includes/discovery/os/engenius.inc.php
+++ b/includes/discovery/os/engenius.inc.php
@@ -1,10 +1,9 @@
 <?php
 
-if(!$os) 
+if (!$os) 
 {
   if (strstr($sysObjectId, ".1.3.6.1.4.1.14125.100.1.3")) { $os = "engenius"; }
   else if (strstr($sysObjectId, ".1.3.6.1.4.1.14125.101.1.3")) { $os = "engenius"; }
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/extremeware.inc.php b/includes/discovery/os/extremeware.inc.php
index 7fa4be126..72d456ac8 100755
--- a/includes/discovery/os/extremeware.inc.php
+++ b/includes/discovery/os/extremeware.inc.php
@@ -1,11 +1,9 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysObjectId, ".1.3.6.1.4.1.1916.2")) { $os = "extremeware"; }
-  if(strstr($sysDescr, "XOS")) { $os = "xos"; }
-
-
+if (!$os)
+{
+  if (strstr($sysObjectId, ".1.3.6.1.4.1.1916.2")) { $os = "extremeware"; }
+  if (strstr($sysDescr, "XOS")) { $os = "xos"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/fortigate.inc.php b/includes/discovery/os/fortigate.inc.php
index 6ecc89d7c..170adeb7c 100755
--- a/includes/discovery/os/fortigate.inc.php
+++ b/includes/discovery/os/fortigate.inc.php
@@ -1,10 +1,9 @@
 <?php
 
-if(!$os) {
-
- if (strstr($sysObjectId, ".1.3.6.1.4.1.12356.15")) { $os = "fortigate";  }
- if (strstr($sysObjectId, ".1.3.6.1.4.1.12356.101.1")) { $os = "fortigate";  }
-
+if (!$os)
+{
+  if (strstr($sysObjectId, ".1.3.6.1.4.1.12356.15")) { $os = "fortigate";  }
+  if (strstr($sysObjectId, ".1.3.6.1.4.1.12356.101.1")) { $os = "fortigate";  }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/freebsd.inc.php b/includes/discovery/os/freebsd.inc.php
index 34bed8bfa..668f93f9a 100755
--- a/includes/discovery/os/freebsd.inc.php
+++ b/includes/discovery/os/freebsd.inc.php
@@ -1,8 +1,10 @@
 <?php
 
-if(!$os) {
-  if(strstr($sysDescr, "FreeBSD")) { $os = "freebsd"; }    ## It's FreeBSD!
-  if(strstr($sysDescr, "Voswall")) { $os = "voswall"; }    ## Oh-No-It-Isn't!!
-  if(strstr($sysDescr, "m0n0wall")) { $os = "monowall"; }  ## Ditto
+if (!$os)
+{
+  if (strstr($sysDescr, "FreeBSD")) { $os = "freebsd"; }    ## It's FreeBSD!
+  if (strstr($sysDescr, "Voswall")) { $os = "voswall"; }    ## Oh-No-It-Isn't!!
+  if (strstr($sysDescr, "m0n0wall")) { $os = "monowall"; }  ## Ditto
 }
-?>
+
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/ftos.inc.php b/includes/discovery/os/ftos.inc.php
index fa5708da2..466daab34 100755
--- a/includes/discovery/os/ftos.inc.php
+++ b/includes/discovery/os/ftos.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "Force10 Operating System")) { $os = "ftos"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "Force10 Operating System")) { $os = "ftos"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/gamatronicups.inc.php b/includes/discovery/os/gamatronicups.inc.php
index ddf61aaba..06e442c64 100644
--- a/includes/discovery/os/gamatronicups.inc.php
+++ b/includes/discovery/os/gamatronicups.inc.php
@@ -1,12 +1,14 @@
 <?php
 
-if(!$os) {
-
-       if ($sysDescr == "") {
-               if (snmp_get($device, "GAMATRONIC-MIB::psUnitManufacture.0", "-Oqv", "") == "Gamatronic") {
-                       $os = "gamatronicups";
-               }
-       }
+if (!$os)
+{
+  if ($sysDescr == "")
+  {
+    if (snmp_get($device, "GAMATRONIC-MIB::psUnitManufacture.0", "-Oqv", "") == "Gamatronic")
+    {
+      $os = "gamatronicups";
+    }
+  }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/ies.inc.php b/includes/discovery/os/ies.inc.php
index de24b56a4..1125cc186 100644
--- a/includes/discovery/os/ies.inc.php
+++ b/includes/discovery/os/ies.inc.php
@@ -1,10 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strpos($sysDescr, "IES-") !== FALSE) { $os = "ies"; }
-
+if (!$os)
+{
+  if (strpos($sysDescr, "IES-") !== FALSE) { $os = "ies"; }
 }
 
-
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/ios.inc.php b/includes/discovery/os/ios.inc.php
index 70c969bf6..01c02c97e 100755
--- a/includes/discovery/os/ios.inc.php
+++ b/includes/discovery/os/ios.inc.php
@@ -1,14 +1,13 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "Cisco Internetwork Operating System Software")) { $os = "ios"; }
-  else if(strstr($sysDescr, "IOS (tm)")) { $os = "ios"; }
-  else if(strstr($sysDescr, "Cisco IOS Software")) { $os = "ios"; }
+if (!$os)
+{
+  if (strstr($sysDescr, "Cisco Internetwork Operating System Software")) { $os = "ios"; }
+  else if (strstr($sysDescr, "IOS (tm)")) { $os = "ios"; }
+  else if (strstr($sysDescr, "Cisco IOS Software")) { $os = "ios"; }
   
-  if(strstr($sysDescr, "IOS-XE")) { $os = "iosxe"; }
-  if(strstr($sysDescr, "IOS XR")) { $os = "iosxr"; }
-
+  if (strstr($sysDescr, "IOS-XE")) { $os = "iosxe"; }
+  if (strstr($sysDescr, "IOS XR")) { $os = "iosxr"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/ipoman.inc.php b/includes/discovery/os/ipoman.inc.php
index ab0863760..31af1b85d 100644
--- a/includes/discovery/os/ipoman.inc.php
+++ b/includes/discovery/os/ipoman.inc.php
@@ -1,8 +1,8 @@
 <?php
 
-if(!$os) 
+if (!$os) 
 {
   if (strstr($sysObjectId, "1.3.6.1.4.1.2468.1.4.2.1")) { $os = "ipoman"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/ironware.inc.php b/includes/discovery/os/ironware.inc.php
index a94238725..388eaf3b3 100755
--- a/includes/discovery/os/ironware.inc.php
+++ b/includes/discovery/os/ironware.inc.php
@@ -1,7 +1,8 @@
 <?php
 
-if(!$os) {
-  if(preg_match("/IronWare/", $sysDescr)) { $os = "ironware"; }
+if (!$os)
+{
+  if (preg_match("/IronWare/", $sysDescr)) { $os = "ironware"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/jetdirect.inc.php b/includes/discovery/os/jetdirect.inc.php
index c1103fc75..e0a6502c0 100644
--- a/includes/discovery/os/jetdirect.inc.php
+++ b/includes/discovery/os/jetdirect.inc.php
@@ -1,11 +1,10 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "JETDIRECT")) { $os = "jetdirect"; }
-  else if(strstr($sysDescr, "HP ETHERNET MULTI-ENVIRONMENT")) { $os = "jetdirect"; }
-  else if(strstr($sysObjectId, ".1.3.6.1.4.1.11.1")) { $os = "jetdirect"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "JETDIRECT")) { $os = "jetdirect"; }
+  else if (strstr($sysDescr, "HP ETHERNET MULTI-ENVIRONMENT")) { $os = "jetdirect"; }
+  else if (strstr($sysObjectId, ".1.3.6.1.4.1.11.1")) { $os = "jetdirect"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/junos.inc.php b/includes/discovery/os/junos.inc.php
index 20946de6d..7212e6b8b 100755
--- a/includes/discovery/os/junos.inc.php
+++ b/includes/discovery/os/junos.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysObjectId, ".1.3.6.1.4.1.2636")) { $os = "junos"; }
-
+if (!$os)
+{
+  if (strstr($sysObjectId, ".1.3.6.1.4.1.2636")) { $os = "junos"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/junose.inc.php b/includes/discovery/os/junose.inc.php
index 7a4f8f542..822e11491 100755
--- a/includes/discovery/os/junose.inc.php
+++ b/includes/discovery/os/junose.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysObjectId, ".1.3.6.1.4.1.4874")) { $os = "junose"; }
-
+if (!$os)
+{
+  if (strstr($sysObjectId, ".1.3.6.1.4.1.4874")) { $os = "junose"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/jwos.inc.php b/includes/discovery/os/jwos.inc.php
index f70e70dfa..d900f39f2 100755
--- a/includes/discovery/os/jwos.inc.php
+++ b/includes/discovery/os/jwos.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysObjectId, "1.3.6.1.4.1.8239.1.2.9")) { $os = "jwos"; }
-
+if (!$os)
+{
+  if (strstr($sysObjectId, "1.3.6.1.4.1.8239.1.2.9")) { $os = "jwos"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/konica.inc.php b/includes/discovery/os/konica.inc.php
index 425383c38..911d78c32 100644
--- a/includes/discovery/os/konica.inc.php
+++ b/includes/discovery/os/konica.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "KONICA MINOLTA ")) { $os = "konica"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "KONICA MINOLTA ")) { $os = "konica"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/kyocera.inc.php b/includes/discovery/os/kyocera.inc.php
index de9d85333..e0d5c56f9 100644
--- a/includes/discovery/os/kyocera.inc.php
+++ b/includes/discovery/os/kyocera.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "KYOCERA ")) { $os = "kyocera"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "KYOCERA ")) { $os = "kyocera"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/linksys.inc.php b/includes/discovery/os/linksys.inc.php
deleted file mode 100755
index 62a2de0c8..000000000
--- a/includes/discovery/os/linksys.inc.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-?>
diff --git a/includes/discovery/os/linux.inc.php b/includes/discovery/os/linux.inc.php
index 11bec22aa..ab3f376f5 100755
--- a/includes/discovery/os/linux.inc.php
+++ b/includes/discovery/os/linux.inc.php
@@ -1,7 +1,8 @@
 <?php
 
-if(!$os) {
-  if(preg_match("/^Linux/", $sysDescr)) { $os = "linux"; }
+if (!$os)
+{
+  if (preg_match("/^Linux/", $sysDescr)) { $os = "linux"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/m0n0wall.inc.php b/includes/discovery/os/m0n0wall.inc.php
deleted file mode 100755
index 6eff33c4e..000000000
--- a/includes/discovery/os/m0n0wall.inc.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-
-?>
diff --git a/includes/discovery/os/mgepdu.inc.php b/includes/discovery/os/mgepdu.inc.php
index 3a464e577..718367cec 100644
--- a/includes/discovery/os/mgepdu.inc.php
+++ b/includes/discovery/os/mgepdu.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "MGE Switched PDU")) { $os = "mgepdu"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "MGE Switched PDU")) { $os = "mgepdu"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/mgeups.inc.php b/includes/discovery/os/mgeups.inc.php
index e93f44fe0..aea30fcb7 100644
--- a/includes/discovery/os/mgeups.inc.php
+++ b/includes/discovery/os/mgeups.inc.php
@@ -1,11 +1,11 @@
 <?php
 
-if(!$os) 
+if (!$os) 
 {
-  if(strstr($sysDescr, "Pulsar M")) { $os = "mgeups"; }
+  if (strstr($sysDescr, "Pulsar M")) { $os = "mgeups"; }
   else if (preg_match("/^Galaxy /", $sysDescr)) { $os = "mgeups"; }
   else if (preg_match("/^Evolution /", $sysDescr)) { $os = "mgeups"; }
   else if ($sysDescr == "MGE UPS SYSTEMS - Network Management Proxy") { $os = "mgeups"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/netbsd.inc.php b/includes/discovery/os/netbsd.inc.php
index 220211d97..17848e495 100755
--- a/includes/discovery/os/netbsd.inc.php
+++ b/includes/discovery/os/netbsd.inc.php
@@ -1,7 +1,8 @@
 <?php
 
-if(!$os) {
-  if(preg_match("/^NetBSD/", $sysDescr)) { $os = "netbsd"; }
+if (!$os)
+{
+  if (preg_match("/^NetBSD/", $sysDescr)) { $os = "netbsd"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/netmanplus.inc.php b/includes/discovery/os/netmanplus.inc.php
index ee4fdf373..42e081971 100644
--- a/includes/discovery/os/netmanplus.inc.php
+++ b/includes/discovery/os/netmanplus.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if (!$os) {
-
+if (!$os)
+{
   if (preg_match("/^NetMan.*plus/", $sysDescr)) { $os = "netmanplus"; }
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/netopia.inc.php b/includes/discovery/os/netopia.inc.php
index 68c15ec32..541503ce0 100644
--- a/includes/discovery/os/netopia.inc.php
+++ b/includes/discovery/os/netopia.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if (!$os) {
-
+if (!$os)
+{
   if (preg_match("/^Netopia /", $sysDescr)) { $os = "netopia"; }
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/netware.inc.php b/includes/discovery/os/netware.inc.php
index b7abfc118..42f85b340 100644
--- a/includes/discovery/os/netware.inc.php
+++ b/includes/discovery/os/netware.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "Novell NetWare")) { $os = "netware"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "Novell NetWare")) { $os = "netware"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/nxos.inc.php b/includes/discovery/os/nxos.inc.php
index 6e0f82f0f..989021c93 100755
--- a/includes/discovery/os/nxos.inc.php
+++ b/includes/discovery/os/nxos.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "NX-OS")) { $os = "nxos"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "NX-OS")) { $os = "nxos"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/okilan.inc.php b/includes/discovery/os/okilan.inc.php
index 1d88c59e8..70f396281 100644
--- a/includes/discovery/os/okilan.inc.php
+++ b/includes/discovery/os/okilan.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "OKI OkiLAN")) { $os = "okilan"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "OKI OkiLAN")) { $os = "okilan"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/openbsd.inc.php b/includes/discovery/os/openbsd.inc.php
index 427207bec..3d2110881 100755
--- a/includes/discovery/os/openbsd.inc.php
+++ b/includes/discovery/os/openbsd.inc.php
@@ -1,7 +1,8 @@
 <?php
 
-if(!$os) {
-  if(preg_match("/^OpenBSD/", $sysDescr)) { $os = "openbsd"; }
+if (!$os)
+{
+  if (preg_match("/^OpenBSD/", $sysDescr)) { $os = "openbsd"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/packetshaper.inc.php b/includes/discovery/os/packetshaper.inc.php
index ef931e60b..849eae3cb 100644
--- a/includes/discovery/os/packetshaper.inc.php
+++ b/includes/discovery/os/packetshaper.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "PacketShaper")) { $os = "packetshaper"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "PacketShaper")) { $os = "packetshaper"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/papouch-tme.inc.php b/includes/discovery/os/papouch-tme.inc.php
index 52e6441b2..6638462c8 100755
--- a/includes/discovery/os/papouch-tme.inc.php
+++ b/includes/discovery/os/papouch-tme.inc.php
@@ -1,10 +1,9 @@
 <?php
 
-if(!$os) {
-
-  if($sysDescr == "SNMP TME") { $os = "papouch-tme"; }
-  else if($sysDescr == "TME") { $os = "papouch-tme"; }
-
+if (!$os)
+{
+  if ($sysDescr == "SNMP TME") { $os = "papouch-tme"; }
+  else if ($sysDescr == "TME") { $os = "papouch-tme"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/powerconnect.inc.php b/includes/discovery/os/powerconnect.inc.php
index db4b0dff5..ba3b351bc 100755
--- a/includes/discovery/os/powerconnect.inc.php
+++ b/includes/discovery/os/powerconnect.inc.php
@@ -7,4 +7,4 @@ if (!$os)
   else if (preg_match("/Dell.*Gigabit\ Ethernet/i",$sysDescr)) { $os = "powerconnect"; } 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/powervault.inc.php b/includes/discovery/os/powervault.inc.php
index 31ce8a241..e2cb5f9c0 100644
--- a/includes/discovery/os/powervault.inc.php
+++ b/includes/discovery/os/powervault.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysObjectId, ".1.3.6.1.4.1.674.10893.2.102")) { $os = "powervault"; }
-
+if (!$os)
+{
+  if (strstr($sysObjectId, ".1.3.6.1.4.1.674.10893.2.102")) { $os = "powervault"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/powerware.inc.php b/includes/discovery/os/powerware.inc.php
index d93e68b9a..d8f465a6c 100644
--- a/includes/discovery/os/powerware.inc.php
+++ b/includes/discovery/os/powerware.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) 
+if (!$os) 
 {
-  
   if (strstr($sysObjectId, ".1.3.6.1.4.1.534")) { $os = "powerware"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/prestige.inc.php b/includes/discovery/os/prestige.inc.php
index 14c5108f8..c2240fc2f 100644
--- a/includes/discovery/os/prestige.inc.php
+++ b/includes/discovery/os/prestige.inc.php
@@ -1,10 +1,9 @@
 <?php
 
-if (!$os) {
-
+if (!$os)
+{
   if (preg_match("/^Prestige \d/", $sysDescr)) { $os = "prestige"; }
   else if (preg_match("/^P-.*-/", $sysDescr)) { $os = "prestige"; }
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/procurve.inc.php b/includes/discovery/os/procurve.inc.php
index e763a0e71..8269be09c 100755
--- a/includes/discovery/os/procurve.inc.php
+++ b/includes/discovery/os/procurve.inc.php
@@ -1,10 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(stristr($sysDescr, "ProCurve")) { $os = "procurve"; }
-
+if (!$os)
+{
+  if (stristr($sysDescr, "ProCurve")) { $os = "procurve"; }
 }
 
-
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/radlan.inc.php b/includes/discovery/os/radlan.inc.php
index 7744f7c5e..f2c237920 100755
--- a/includes/discovery/os/radlan.inc.php
+++ b/includes/discovery/os/radlan.inc.php
@@ -6,4 +6,4 @@ if (!$os)
   if (strstr($sysDescr, "AT-8000")) { $os = "radlan"; }           /* Allied Telesis AT-8000 */
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/redback.inc.php b/includes/discovery/os/redback.inc.php
index 6c86b4489..e53ff830d 100644
--- a/includes/discovery/os/redback.inc.php
+++ b/includes/discovery/os/redback.inc.php
@@ -1,7 +1,8 @@
 <?php
 
-if(!$os) {
-  if(preg_match("/Redback/", $sysDescr)) { $os = "redback"; }
+if (!$os)
+{
+  if (preg_match("/Redback/", $sysDescr)) { $os = "redback"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/ricoh.inc.php b/includes/discovery/os/ricoh.inc.php
index 47df745ec..419d6dfd3 100644
--- a/includes/discovery/os/ricoh.inc.php
+++ b/includes/discovery/os/ricoh.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "RICOH Aficio")) { $os = "ricoh"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "RICOH Aficio")) { $os = "ricoh"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/routeros.inc.php b/includes/discovery/os/routeros.inc.php
index 1f419ef21..863754101 100644
--- a/includes/discovery/os/routeros.inc.php
+++ b/includes/discovery/os/routeros.inc.php
@@ -1,12 +1,14 @@
 <?php
 
-if(!$os) {
-
-       if ($sysDescr == "router") {
-               if (is_numeric(snmp_get($device, "SNMPv2-SMI::enterprises.14988.1.1.4.3.0", "-Oqv", ""))) {
-                       $os = "routeros";
-               }
-       }
+if (!$os)
+{
+  if ($sysDescr == "router")
+  {
+    if (is_numeric(snmp_get($device, "SNMPv2-SMI::enterprises.14988.1.1.4.3.0", "-Oqv", "")))
+    {
+      $os = "routeros";
+    }
+  }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/sanos.inc.php b/includes/discovery/os/sanos.inc.php
index b85be44b7..caaef74ac 100755
--- a/includes/discovery/os/sanos.inc.php
+++ b/includes/discovery/os/sanos.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "SAN-OS")) { $os = "sanos"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "SAN-OS")) { $os = "sanos"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/screenos.inc.php b/includes/discovery/os/screenos.inc.php
index 6754bdd7f..1982878ae 100755
--- a/includes/discovery/os/screenos.inc.php
+++ b/includes/discovery/os/screenos.inc.php
@@ -1,10 +1,9 @@
 <?php
 
-if(!$os) {
-
+if (!$os)
+{
  if (strstr($sysObjectId, ".1.3.6.1.4.1.674.3224.1")) { $os = "screenos";  }
  if (strstr($sysObjectId, ".1.3.6.1.4.1.3224")) { $os = "screenos";  }
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/solaris.inc.php b/includes/discovery/os/solaris.inc.php
index 6795b0dea..af4508721 100755
--- a/includes/discovery/os/solaris.inc.php
+++ b/includes/discovery/os/solaris.inc.php
@@ -1,15 +1,16 @@
 <?php
 
-if(!$os) {
-  if(preg_match("/^SunOS/", $sysDescr)) 
+if (!$os)
+{
+  if (preg_match("/^SunOS/", $sysDescr)) 
   { 
     $os = "solaris"; 
     list(,,$version) = explode (" ", $sysDescr);
-    if($version > "5.10") { $os = "opensolaris"; }
-    if($version > "5.10") { 
-      if(preg_match("/oi_/", $sysDescr)) { $os = "openindiana"; }
+    if ($version > "5.10") { $os = "opensolaris"; }
+    if ($version > "5.10") { 
+      if (preg_match("/oi_/", $sysDescr)) { $os = "openindiana"; }
     }
   }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/sonicwall.inc.php b/includes/discovery/os/sonicwall.inc.php
index 31c150379..507979940 100644
--- a/includes/discovery/os/sonicwall.inc.php
+++ b/includes/discovery/os/sonicwall.inc.php
@@ -5,4 +5,4 @@ if (!$os)
   if (strstr($sysDescr, "SonicWALL")) { $os = "sonicwall"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/speedtouch.inc.php b/includes/discovery/os/speedtouch.inc.php
index 8983d73da..0f1755c6d 100755
--- a/includes/discovery/os/speedtouch.inc.php
+++ b/includes/discovery/os/speedtouch.inc.php
@@ -1,11 +1,10 @@
 <?php
 
-if(!$os) {
-
-  if(strpos($sysDescr, "TG585v7") !== FALSE) { $os = "speedtouch"; }
-  else if(strpos($sysDescr, "SpeedTouch ") !== FALSE) { $os = "speedtouch"; }
+if (!$os)
+{
+  if (strpos($sysDescr, "TG585v7") !== FALSE) { $os = "speedtouch"; }
+  else if (strpos($sysDescr, "SpeedTouch ") !== FALSE) { $os = "speedtouch"; }
   else if (preg_match("/^ST\d/", $sysDescr)) { $os = "speedtouch"; }
-
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/tranzeo.inc.php b/includes/discovery/os/tranzeo.inc.php
index fc6d0229d..6bd6d8535 100644
--- a/includes/discovery/os/tranzeo.inc.php
+++ b/includes/discovery/os/tranzeo.inc.php
@@ -1,8 +1,8 @@
 <?php
 
-if(!$os) {
-  if(preg_match("/^Tranzeo/", $sysDescr)) { $os = "tranzeo"; }
+if (!$os)
+{
+  if (preg_match("/^Tranzeo/", $sysDescr)) { $os = "tranzeo"; }
 }
 
-?>
-
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/vrp.inc.php b/includes/discovery/os/vrp.inc.php
index 23bbb4229..78094fddb 100644
--- a/includes/discovery/os/vrp.inc.php
+++ b/includes/discovery/os/vrp.inc.php
@@ -1,11 +1,10 @@
 <?php
 
-if(!$os) {
-
-  if(stristr($sysDescr, "VRP (R) Software")) { $os = "vrp"; }
-  else if(stristr($sysDescr, "VRP Software Version")) { $os = "vrp"; }
-  else if(stristr($sysDescr, "Software Version VRP")) { $os = "vrp"; }
-
+if (!$os)
+{
+  if (stristr($sysDescr, "VRP (R) Software")) { $os = "vrp"; }
+  else if (stristr($sysDescr, "VRP Software Version")) { $os = "vrp"; }
+  else if (stristr($sysDescr, "Software Version VRP")) { $os = "vrp"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/vyatta.inc.php b/includes/discovery/os/vyatta.inc.php
index 2df1dcd87..b1cbda6dd 100644
--- a/includes/discovery/os/vyatta.inc.php
+++ b/includes/discovery/os/vyatta.inc.php
@@ -1,7 +1,8 @@
 <?php
 
-if(!$os) {
-  if(preg_match("/^Vyatta/", $sysDescr)) { $os = "vyatta"; }
+if (!$os)
+{
+  if (preg_match("/^Vyatta/", $sysDescr)) { $os = "vyatta"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/windows.inc.php b/includes/discovery/os/windows.inc.php
index 3f34d13d5..21d3d7543 100644
--- a/includes/discovery/os/windows.inc.php
+++ b/includes/discovery/os/windows.inc.php
@@ -1,8 +1,8 @@
 <?php
 
-if(!$os) {
-  if(preg_match("/Windows/", $sysDescr)) { $os = "windows"; }
+if (!$os)
+{
+  if (preg_match("/Windows/", $sysDescr)) { $os = "windows"; }
 }
 
-?>
-
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/wxgoos.inc.php b/includes/discovery/os/wxgoos.inc.php
index 87a7c168d..447f0269b 100644
--- a/includes/discovery/os/wxgoos.inc.php
+++ b/includes/discovery/os/wxgoos.inc.php
@@ -1,13 +1,12 @@
 <?php
 
-if(!$os) 
+if (!$os) 
 {
   if ($sysDescr == 'NETOS 6.0')
   {
-    if(strstr($sysObjectId, ".1.3.6.1.4.1.901.1")) { $os = "wxgoos"; }
+    if (strstr($sysObjectId, ".1.3.6.1.4.1.901.1")) { $os = "wxgoos"; }
   }
-  
   if (strstr($sysObjectId, ".1.3.6.1.4.1.17373")) { $os = "wxgoos"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/xerox.inc.php b/includes/discovery/os/xerox.inc.php
index fdb24bb07..5fec318c2 100644
--- a/includes/discovery/os/xerox.inc.php
+++ b/includes/discovery/os/xerox.inc.php
@@ -1,10 +1,9 @@
 <?php
 
-if(!$os) {
-
-  if(strstr($sysDescr, "Xerox Phaser")) { $os = "xerox"; }
-  else if(strstr($sysDescr, "Xerox WorkCentre")) { $os = "xerox"; }
-
+if (!$os)
+{
+  if (strstr($sysDescr, "Xerox Phaser")) { $os = "xerox"; }
+  else if (strstr($sysDescr, "Xerox WorkCentre")) { $os = "xerox"; }
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/zywall.inc.php b/includes/discovery/os/zywall.inc.php
index 7ae44e51d..5d46c7df7 100644
--- a/includes/discovery/os/zywall.inc.php
+++ b/includes/discovery/os/zywall.inc.php
@@ -1,10 +1,8 @@
 <?php
 
-if(!$os) {
-
-  if(strpos($sysDescr, "ZyWALL") !== FALSE) { $os = "zywall"; }
-
+if (!$os)
+{
+  if (strpos($sysDescr, "ZyWALL") !== FALSE) { $os = "zywall"; }
 }
 
-
-?>
+?>
\ No newline at end of file
diff --git a/includes/discovery/os/zyxeles.inc.php b/includes/discovery/os/zyxeles.inc.php
index 24d99a3b4..d539826ac 100644
--- a/includes/discovery/os/zyxeles.inc.php
+++ b/includes/discovery/os/zyxeles.inc.php
@@ -1,9 +1,8 @@
 <?php
 
-if (!$os) {
-
+if (!$os)
+{
   if (preg_match("/^ES-/", $sysDescr)) { $os = "zyxeles"; }
-
 }
 
-?>
+?>
\ No newline at end of file