From 5d005e4ba27978cee0ce9040ba3a95bb0b9c41d8 Mon Sep 17 00:00:00 2001
From: trashbo4t <nolanhodge@cmail.carleton.ca>
Date: Wed, 14 Mar 2018 16:02:47 -0400
Subject: [PATCH] Using HTTPS for macvendor lookups instead of HTTP (#17)

Updates WPS, MACInfo, SiteSurvey, and Status modules.
---
 MACInfo/api/module.php    | 4 ++--
 MACInfo/module.info       | 2 +-
 SiteSurvey/api/module.php | 2 +-
 SiteSurvey/module.info    | 4 ++--
 Status/api/module.php     | 2 +-
 Status/module.info        | 4 ++--
 wps/api/module.php        | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/MACInfo/api/module.php b/MACInfo/api/module.php
index 7b1d56f..52cc8e8 100644
--- a/MACInfo/api/module.php
+++ b/MACInfo/api/module.php
@@ -17,7 +17,7 @@ class MACInfo extends Module
     private function getMACInfo($mac)
     {
         if($this->IsValidMAC($mac)){
-            $url = "http://macvendors.co/api/" . $mac . "/JSON";
+            $url = "https://macvendors.co/api/" . $mac . "/JSON";
             $retJSON = file_get_contents($url);
             if($retJSON != false){
                 $mInfo = json_decode($retJSON);
@@ -42,4 +42,4 @@ class MACInfo extends Module
         $pregResult = preg_match('/([a-fA-F0-9]{2}[:|\-]?){6}/', $mac);
         return ($pregResult != 0 && $pregResult != NULL);
     }
-}
\ No newline at end of file
+}
diff --git a/MACInfo/module.info b/MACInfo/module.info
index ae31d8a..e264905 100644
--- a/MACInfo/module.info
+++ b/MACInfo/module.info
@@ -6,5 +6,5 @@
         "tetra"
     ],
     "title": "MAC Info",
-    "version": "1.2"
+    "version": "1.3"
 }
diff --git a/SiteSurvey/api/module.php b/SiteSurvey/api/module.php
index 82d212f..bfebc96 100644
--- a/SiteSurvey/api/module.php
+++ b/SiteSurvey/api/module.php
@@ -385,7 +385,7 @@ class SiteSurvey extends Module
 
 	private function getMACInfo()
 	{
-		$content = file_get_contents("http://api.macvendors.com/".$this->request->mac);
+		$content = file_get_contents("https://api.macvendors.com/".$this->request->mac);
 		$this->response = array('title' => $this->request->mac, "output" => $content);
 	}
 
diff --git a/SiteSurvey/module.info b/SiteSurvey/module.info
index 79862d7..6b1f6e2 100644
--- a/SiteSurvey/module.info
+++ b/SiteSurvey/module.info
@@ -6,5 +6,5 @@
         "tetra"
     ],
     "title": "Site Survey",
-    "version": "1.2"
-}
\ No newline at end of file
+    "version": "1.3"
+}
diff --git a/Status/api/module.php b/Status/api/module.php
index 77505e4..9433efe 100644
--- a/Status/api/module.php
+++ b/Status/api/module.php
@@ -248,7 +248,7 @@ class Status extends Module
 
 		private function getMACInfo()
 		{
-			$content = file_get_contents("http://api.macvendors.com/".$this->request->mac);
+			$content = file_get_contents("https://api.macvendors.com/".$this->request->mac);
 			$this->response = array('title' => $this->request->mac, "output" => $content);
 		}
 
diff --git a/Status/module.info b/Status/module.info
index 4c97a5f..91ca8af 100644
--- a/Status/module.info
+++ b/Status/module.info
@@ -6,5 +6,5 @@
         "tetra"
     ],
     "title": "Status",
-    "version": "1.1"
-}
\ No newline at end of file
+    "version": "1.2"
+}
diff --git a/wps/api/module.php b/wps/api/module.php
index 96e226d..cde485a 100644
--- a/wps/api/module.php
+++ b/wps/api/module.php
@@ -349,7 +349,7 @@ class wps extends Module
 
 	private function getMACInfo()
 	{
-		$content = file_get_contents("http://api.macvendors.com/".$this->request->mac);
+		$content = file_get_contents("https://api.macvendors.com/".$this->request->mac);
 		$this->response = array('title' => $this->request->mac, "output" => $content);
 	}