From 06f95595cdafc7929550e49047a18e3047667a20 Mon Sep 17 00:00:00 2001
From: Mark Gibbons <mgibbons@oemcomp.com>
Date: Sat, 4 Apr 2015 22:06:31 +0100
Subject: [PATCH] Remove ubiquitiap os type from discovery and polling sub dirs

---
 includes/discovery/os/ubiquitiap.inc.php |  9 ---------
 includes/polling/os/ubiquitiap.inc.php   | 13 -------------
 2 files changed, 22 deletions(-)
 delete mode 100644 includes/discovery/os/ubiquitiap.inc.php
 delete mode 100644 includes/polling/os/ubiquitiap.inc.php

diff --git a/includes/discovery/os/ubiquitiap.inc.php b/includes/discovery/os/ubiquitiap.inc.php
deleted file mode 100644
index 1160345d9..000000000
--- a/includes/discovery/os/ubiquitiap.inc.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if (!$os || $os == 'linux') {
-    if (stristr(snmp_get($device, "dot11manufacturerName.5", "-Oqv", "IEEE802dot11-MIB"),"Ubiquiti Networks") || stristr(snmp_get($device, "dot11manufacturerName.6", "-Oqv", "IEEE802dot11-MIB"),"Ubiquiti Networks")) {
-        $os = "ubiquitiap";
-    }
-}
-
-?>
diff --git a/includes/polling/os/ubiquitiap.inc.php b/includes/polling/os/ubiquitiap.inc.php
deleted file mode 100644
index 545862f72..000000000
--- a/includes/polling/os/ubiquitiap.inc.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-$data = snmp_get_multi($device, "dot11manufacturerProductName.5 dot11manufacturerProductVersion.5", "-Oqv", "IEEE802dot11-MIB");
-if (empty($data)) {
-    $data = snmp_get_multi($device, "dot11manufacturerProductName.6 dot11manufacturerProductVersion.6", "-Oqv", "IEEE802dot11-MIB");
-}
-$hardware = $data[0];
-
-if (preg_match("/(v[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", $data[1],$matches)) {
-    $version = $matches[0];
-}
-
-?>