Using HTTPS for macvendor lookups instead of HTTP (#17)

Updates WPS, MACInfo, SiteSurvey, and Status modules.
pull/20/merge
trashbo4t 2018-03-14 16:02:47 -04:00 committed by Sebastian Kinne
parent 4a8791edbb
commit 5d005e4ba2
7 changed files with 10 additions and 10 deletions

View File

@ -17,7 +17,7 @@ class MACInfo extends Module
private function getMACInfo($mac) private function getMACInfo($mac)
{ {
if($this->IsValidMAC($mac)){ if($this->IsValidMAC($mac)){
$url = "http://macvendors.co/api/" . $mac . "/JSON"; $url = "https://macvendors.co/api/" . $mac . "/JSON";
$retJSON = file_get_contents($url); $retJSON = file_get_contents($url);
if($retJSON != false){ if($retJSON != false){
$mInfo = json_decode($retJSON); $mInfo = json_decode($retJSON);
@ -42,4 +42,4 @@ class MACInfo extends Module
$pregResult = preg_match('/([a-fA-F0-9]{2}[:|\-]?){6}/', $mac); $pregResult = preg_match('/([a-fA-F0-9]{2}[:|\-]?){6}/', $mac);
return ($pregResult != 0 && $pregResult != NULL); return ($pregResult != 0 && $pregResult != NULL);
} }
} }

View File

@ -6,5 +6,5 @@
"tetra" "tetra"
], ],
"title": "MAC Info", "title": "MAC Info",
"version": "1.2" "version": "1.3"
} }

View File

@ -385,7 +385,7 @@ class SiteSurvey extends Module
private function getMACInfo() 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); $this->response = array('title' => $this->request->mac, "output" => $content);
} }

View File

@ -6,5 +6,5 @@
"tetra" "tetra"
], ],
"title": "Site Survey", "title": "Site Survey",
"version": "1.2" "version": "1.3"
} }

View File

@ -248,7 +248,7 @@ class Status extends Module
private function getMACInfo() 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); $this->response = array('title' => $this->request->mac, "output" => $content);
} }

View File

@ -6,5 +6,5 @@
"tetra" "tetra"
], ],
"title": "Status", "title": "Status",
"version": "1.1" "version": "1.2"
} }

View File

@ -349,7 +349,7 @@ class wps extends Module
private function getMACInfo() 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); $this->response = array('title' => $this->request->mac, "output" => $content);
} }