Sync version 1.6 stage 3

samdenty · Aug 8, 2017 · 8303378 · 8303378
1 parent fa6ce63
commit 8303378
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 22 deletions.
diff --git a/arduino/Wi-PWN/APScan.cpp b/arduino/Wi-PWN/APScan.cpp
@@ -182,7 +182,7 @@ void APScan::sendResults() {
     json += "\"r\":" + (String)getAPRSSI(i) + ",";
     json += "\"e\":" + (String)encryption[i] + ",";
     //json += "\"v\":\""+getAPVendor(i)+"\",";
-    json += "\"se\":" + (String)getAPSelected(i);
+    json += "\"se\":" + (String)isSelected(i);
     json += "}";
     if ((i != results - 1) && (i != maxAPScanResults - 1)) json += ",";
 
@@ -215,7 +215,7 @@ String APScan::getResultsJSON() {
     json += "\"r\":" + (String)getAPRSSI(i) + ",";
     json += "\"e\":" + (String)encryption[i] + ",";
     //json += "\"v\":\""+getAPVendor(i)+"\",";
-    json += "\"se\":" + (String)getAPSelected(i);
+    json += "\"se\":" + (String)isSelected(i);
     json += "}";
     if ((i != results - 1) && (i != maxAPScanResults - 1)) json += ",";
   }

diff --git a/arduino/Wi-PWN/Settings.cpp b/arduino/Wi-PWN/Settings.cpp
@@ -118,7 +118,6 @@ void Settings::reset() {
   attackTimeout = 0;
   attackPacketRate = 10;
   clientScanTime = 15;
-  attackEncrypted = true;
   useLed = true;
   channelHop = false;
   multiAPs = true;
@@ -136,7 +135,7 @@ void Settings::reset() {
   detectorScanTime = 200;
   pins = "000000";
   pinNames = "Pin 3;Pin 4;Pin 5;Pin 6;Pin 7;Pin 8"; 
-  if (debug) Serial.println("done");
+  if (debug) Serial.println("Reset complete!");
 
   save();
 }
@@ -188,7 +187,7 @@ void Settings::save() {
   for (int i = 0; i < pinNamesLen; i++) EEPROM.write(pinNamesAdr + i, pinNames[i]);
   EEPROM.commit();
 
-  int i=0;
+  /*int i=0;
   int pinNumber = 3;
   Serial.println("START");
   while (i < 6)
@@ -200,7 +199,7 @@ void Settings::save() {
      Serial.println((String)pinNumber + (String)": " + pinState);
      pinNumber++;
   }
-  Serial.println("END");
+  Serial.println("END");*/
 
   if (debug) {
     info();
@@ -218,7 +217,7 @@ void Settings::info() {
   Serial.println("  Interface       : dark-mode='" + (String)darkMode + "'\t\t|  new-user='" + (String)newUser + "'\t\t\t|  cache='" + (String)cache + "'");
   Serial.println("  LED Indicator   : enable='" + (String)useLed + "'\t\t\t|  pin='" + (String)ledPin + "'\t\t\t|");
   Serial.println("  MAC AP          : default='" + defaultMacAP.toString()+"'\t|  saved='" + macAP.toString()+"'\t|  random='" + (String)isMacAPRand + "'");
-  Serial.println("  Beacons         : mac-change-interval='" + (String)multiAttacks + "'\t|  " + "WPA2='" + (String)attackEncrypted + "'\t\t\t|  1s-interval='" + (String)beaconInterval + "");
+  Serial.println("  Beacons         : mac-change-interval='" + (String)multiAttacks + "'\t|  " + "1s-interval='" + (String)beaconInterval + "");
   Serial.println("  Deauth Detector : all-channels='" + (String)detectorAllChannels + "'\t\t|  channel='" + (String)detectorChannel + "'\t\t\t|  alert-pin='" + (String)alertPin + "'\t|  invert-pin='" + (String)invertAlertPin + "'\t|  scan-time='" + (String)detectorScanTime + "'");
   Serial.println("  Other           : channel-hopping='" + (String)channelHop + "'\t\t|  multiple-aps='" + (String)multiAPs + "'\t\t|  multiple-attacks='" + (String)multiAttacks + "'");
   Serial.println("  PIN Control     : state='" + (String)pins + "'\t\t|  names='" + (String)pinNames + "'");

diff --git a/arduino/Wi-PWN/Wi-PWN.ino b/arduino/Wi-PWN/Wi-PWN.ino
@@ -4,7 +4,7 @@
  *     https://github.com/samdenty99/Wi-PWN     *
  *            (c) 2017 Samuel Denty             *
  *----------------------------------------------*
- *  Wi-PWN based on spacehuhn/esp8266_deauther  *
+ *  Wi-PWN based on spacehuhn/esp8266_dseauther *
  *              (c) Stefan Kremser              *
  ************************************************
 */
@@ -531,6 +531,7 @@ void getSettings() {
 }
 
 void saveSettings() {
+  server.send( 200, "text/json", "true" );
   if (server.hasArg("ssid")) settings.ssid = server.arg("ssid");
   if (server.hasArg("ssidHidden")) {
     if (server.arg("ssidHidden") == "false") settings.ssidHidden = false;
@@ -652,7 +653,6 @@ void saveSettings() {
   if (server.hasArg("pins")) settings.pins = server.arg("pins");
 
   settings.save();
-  server.send( 200, "text/json", "true" );
 }
 
 void resetSettings() {

diff --git a/arduino/Wi-PWN/data.h b/arduino/Wi-PWN/data.h
diff --git a/pictures/secondary-banner.png b/pictures/secondary-banner.png
diff --git a/web_server/html/js/users.js b/web_server/html/js/users.js
@@ -51,7 +51,7 @@ function getResults() {
             if (res.clients[i].l >= 0) {
                 tr += '<td class="darken-on-hover" onclick="setName(' + res.clients[i].i + ')"><span class="a b">' + escapeHTML(res.clients[i].n) + '</span><br>' +  escapeHTML(res.clients[i].v)  +'</td>';
             } else {
-                tr += '<td class="darken-on-hover" onclick="setName(' + res.clients[i].i + ')"><span class="a light-6">set name</span><br>' + escapeHTML(res.clients[i].v) + '</td>';
+                tr += '<td class="darken-on-hover" onclick="setName(' + res.clients[i].i + ')"><span class="a light-6">save</span><br>' + escapeHTML(res.clients[i].v) + '</td>';
             }
             tr += '<td onclick="select(' + res.clients[i].i + ')"><b>' + res.clients[i].m + '</b><br>' +  escapeHTML(res.clients[i].a) + '</td>';
             tr += '<td onclick="select(' + res.clients[i].i + ')">' + res.clients[i].p + '</td>';