Commit 0b6e74f5 authored by Eric - kg6wxc's avatar Eric - kg6wxc
Browse files

Merge branch 'master' of https://gitlab.kg6wxc.net/mesh/meshmap

parents 3ed6f604 d47b65a8
...@@ -2,11 +2,6 @@ ...@@ -2,11 +2,6 @@
<!-- May 2018 --> <!-- May 2018 -->
<img src="https://mapping.kg6wxc.net/meshmap/images/MESHMAP_LOGO.svg" style="float:left; vertical-align: middle;"/><h1 style="float: left; vertical-align: middle;">MeshMap</h1> <img src="https://mapping.kg6wxc.net/meshmap/images/MESHMAP_LOGO.svg" style="float:left; vertical-align: middle;"/><h1 style="float: left; vertical-align: middle;">MeshMap</h1>
<br/> <br/>
<br/>
<br/>
<br/>
<br/>
<br/>
Automated mapping of AREDN Networks. Automated mapping of AREDN Networks.
2016-2018 - Eric Satterlee / KG6WXC 2016-2018 - Eric Satterlee / KG6WXC
Addtional Credit to: Mark/N2MH and Glen/K6GSE for their work on this project. Addtional Credit to: Mark/N2MH and Glen/K6GSE for their work on this project.
......
...@@ -388,8 +388,11 @@ if ($getNodeInfo) { ...@@ -388,8 +388,11 @@ if ($getNodeInfo) {
else { else {
$chanbw = "0"; $chanbw = "0";
} }
if ($meshRF == "off") { if (isset($result['meshrf']['status'])) {
$ssid = "NONE"; if ($result['meshrf']['status'] == "off") {
$meshRF = "off";
$ssid = "NONE";
}
}else { }else {
$ssid = $result['meshrf']['ssid']; $ssid = $result['meshrf']['ssid'];
} }
......
...@@ -160,8 +160,11 @@ if($sysinfoJson === FALSE) { ...@@ -160,8 +160,11 @@ if($sysinfoJson === FALSE) {
else { else {
$chanbw = "0"; $chanbw = "0";
} }
if ($meshRF == "off") { if (isset($result['meshrf']['status'])) {
$ssid = "NONE"; if ($result['meshrf']['status'] == "off") {
$meshRF = "off";
$ssid = "NONE";
}
}else { }else {
$ssid = $result['meshrf']['ssid']; $ssid = $result['meshrf']['ssid'];
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment