From c3c11c26f1f9e405579042c272965a1f85bcb334 Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Sat, 11 Jul 2015 12:16:30 +1000
Subject: [PATCH] Fix closing tag best practice, tidy formatting

---
 includes/discovery/os/merakimr.inc.php | 6 +++---
 includes/discovery/os/merakims.inc.php | 6 +++---
 includes/discovery/os/merakimx.inc.php | 6 +++---
 includes/polling/os/merakimr.inc.php   | 7 ++-----
 includes/polling/os/merakims.inc.php   | 7 ++-----
 includes/polling/os/merakimx.inc.php   | 7 ++-----
 6 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/includes/discovery/os/merakimr.inc.php b/includes/discovery/os/merakimr.inc.php
index a8255a6b3..01d88c722 100644
--- a/includes/discovery/os/merakimr.inc.php
+++ b/includes/discovery/os/merakimr.inc.php
@@ -11,7 +11,7 @@
  */    
 
 if (!$os) {
-    if (preg_match("/^Meraki MR/", $sysDescr)) { $os = "merakimr"; }
+    if (preg_match("/^Meraki MR/", $sysDescr)) {
+        $os = "merakimr";
+    }
 }
-
-?>
diff --git a/includes/discovery/os/merakims.inc.php b/includes/discovery/os/merakims.inc.php
index 8635c0e95..341f809a9 100644
--- a/includes/discovery/os/merakims.inc.php
+++ b/includes/discovery/os/merakims.inc.php
@@ -11,7 +11,7 @@
  */    
 
 if (!$os) {
-    if (preg_match("/^Meraki MS/", $sysDescr)) { $os = "merakims"; }
+    if (preg_match("/^Meraki MS/", $sysDescr)) {
+        $os = "merakims";
+    }
 }
-
-?>
diff --git a/includes/discovery/os/merakimx.inc.php b/includes/discovery/os/merakimx.inc.php
index aa0f87e91..66a744755 100644
--- a/includes/discovery/os/merakimx.inc.php
+++ b/includes/discovery/os/merakimx.inc.php
@@ -11,7 +11,7 @@
  */    
 
 if (!$os) {
-    if (preg_match("/^Meraki MX/", $sysDescr)) { $os = "merakimx"; }
+    if (preg_match("/^Meraki MX/", $sysDescr)) {
+        $os = "merakimx";
+    }
 }
-
-?>
diff --git a/includes/polling/os/merakimr.inc.php b/includes/polling/os/merakimr.inc.php
index 2158f6c25..cbbd32c9a 100644
--- a/includes/polling/os/merakimr.inc.php
+++ b/includes/polling/os/merakimr.inc.php
@@ -10,9 +10,6 @@
  * the source code distribution for details.
  */    
 
-if(empty($hardware)) {
-  $hardware = snmp_get($device, "sysDescr.0", "-Osqv", "SNMPv2-MIB");
+if (empty($hardware)) {
+    $hardware = snmp_get($device, "sysDescr.0", "-Osqv", "SNMPv2-MIB");
 }
-
-
-?>
diff --git a/includes/polling/os/merakims.inc.php b/includes/polling/os/merakims.inc.php
index 1bfdaedc3..d63ccb209 100644
--- a/includes/polling/os/merakims.inc.php
+++ b/includes/polling/os/merakims.inc.php
@@ -10,9 +10,6 @@
  * the source code distribution for details.
  */    
 
-if(empty($hardware)) {
-  $hardware = snmp_get($device, "sysDescr.0", "-Osqv", "SNMPv2-MIB");
+if (empty($hardware)) {
+    $hardware = snmp_get($device, "sysDescr.0", "-Osqv", "SNMPv2-MIB");
 }
-
-
-?>
diff --git a/includes/polling/os/merakimx.inc.php b/includes/polling/os/merakimx.inc.php
index 217ca3afc..60ffbd128 100644
--- a/includes/polling/os/merakimx.inc.php
+++ b/includes/polling/os/merakimx.inc.php
@@ -10,9 +10,6 @@
  * the source code distribution for details.
  */    
 
-if(empty($hardware)) {
-  $hardware = snmp_get($device, "sysDescr.0", "-Osqv", "SNMPv2-MIB");
+if (empty($hardware)) {
+    $hardware = snmp_get($device, "sysDescr.0", "-Osqv", "SNMPv2-MIB");
 }
-
-
-?>