Improved APScan UI (Halloween easter egg)

Display an icon when the SSID is hidden. Useful to difference an hidden AP and an AP named "* Hidden SSID *"
SpacehuhnTech · Oct 24, 2017 · 3b1528f · 3b1528f
1 parent dc23c64
commit 3b1528f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/esp8266_deauther/APScan.cpp b/esp8266_deauther/APScan.cpp
@@ -108,7 +108,7 @@ String APScan::getEncryption(int code) {
 }
 
 String APScan::getAPName(int num) {
-  if (isHidden(num)) return "* Hidden SSID *";
+  //if (isHidden(num)) return "* Hidden SSID *";
   return names[num];
 }
 String APScan::getAPEncryption(int num) {
@@ -166,7 +166,7 @@ void APScan::sendResults() {
       _size += 6; // "e": ,
       _size += 6; // "se":0
       _size++; // }*/
-    _size += 61;
+    _size += 67;
     _size += String(i).length();
     _size += String(getAPChannel(i)).length();
     _size += sanitizeJson(getAPName(i)).length();
@@ -193,7 +193,8 @@ void APScan::sendResults() {
     json += "\"r\":" + (String)getAPRSSI(i) + ",";
     json += "\"e\":" + (String)encryption[i] + ",";
     //json += "\"v\":\""+getAPVendor(i)+"\",";
-    json += "\"se\":" + (String)isSelected(i);
+    json += "\"h\":" + (String)hidden[i] + ",";
+    json += "\"se\":" + (String)isSelected(i);   
     json += "}";
     if ((i != results - 1) && (i != maxAPScanResults - 1)) json += ",";
 
@@ -226,6 +227,7 @@ String APScan::getResultsJSON() {
     json += "\"r\":" + (String)getAPRSSI(i) + ",";
     json += "\"e\":" + (String)encryption[i] + ",";
     //json += "\"v\":\""+getAPVendor(i)+"\",";
+    json += "\"h\":" + (String)hidden[i] + ",";
     json += "\"se\":" + (String)isSelected(i);
     json += "}";
     if ((i != results - 1) && (i != maxAPScanResults - 1)) json += ",";

diff --git a/esp8266_deauther/data/js/apscan.js b/esp8266_deauther/data/js/apscan.js
@@ -17,16 +17,18 @@ function compare(a, b) {
   return 0;
 }
 
-function getEncryption(num) {
+function getStatus(enc, hid) {
   /*
-  if (num == 8) return "WPA*";
-  else if (num == 4) return "WPA2";
-  else if (num == 2) return "WPA";
-  else if (num == 7) return "none";
-  else if (num == 5) return "WEP";
+  if (enc == 8) return "WPA*";
+  else if (enc == 4) return "WPA2";
+  else if (enc == 2) return "WPA";
+  else if (enc == 7) return "none";
+  else if (enc == 5) return "WEP";
   */
-	if (num == 7) return " ";
-	else return "&#128274;";
+	var buff = "";
+	if (enc != 7) buff += "&#128274;  ";
+	if (hid == 1) buff += "&#128123;  ";
+	return buff;
 }
 
 function getResults() {
@@ -59,7 +61,7 @@ function getResults() {
       else tr += '<tr>';
       tr += '<td>' + res.aps[i].c + '</td>';
       tr += '<td>' + escapeHTML(res.aps[i].ss) + '</td>';
-      tr += '<td>' + getEncryption(res.aps[i].e) + '</td>';
+      tr += '<td>' + getStatus(res.aps[i].e, res.aps[i].h) + '</td>';
 	  //tr += '<td>' + res.aps[i].r + ' <meter value="' + res.aps[i].r + '" max="-30" min="-100" low="-80" high="-60" optimum="-50"></meter></td>';
 	  var _width = res.aps[i].r + 130;
 	  var _color;