mirror of
https://github.com/SpacehuhnTech/esp8266_deauther.git
synced 2025-12-22 15:16:47 -08:00
Cleaned up Wifi class a bit
This commit is contained in:
@@ -113,34 +113,20 @@ String getWifiMode() {
|
|||||||
|
|
||||||
String getContentType(String filename) {
|
String getContentType(String filename) {
|
||||||
if (server.hasArg("download")) return String(F("application/octet-stream"));
|
if (server.hasArg("download")) return String(F("application/octet-stream"));
|
||||||
|
else if (filename.endsWith(str(W_DOT_GZIP))) filename = filename.substring(0, filename.length() - 3);
|
||||||
if (filename.endsWith(str(W_DOT_GZIP))) filename = filename.substring(0, filename.length() - 3);
|
else if (filename.endsWith(str(W_DOT_HTM))) return str(W_HTML);
|
||||||
|
else if (filename.endsWith(str(W_DOT_HTML))) return str(W_HTML);
|
||||||
if (filename.endsWith(str(W_DOT_HTM))) return str(W_HTML);
|
else if (filename.endsWith(str(W_DOT_CSS))) return str(W_CSS);
|
||||||
|
else if (filename.endsWith(str(W_DOT_JS))) return str(W_JS);
|
||||||
if (filename.endsWith(str(W_DOT_HTML))) return str(W_HTML);
|
else if (filename.endsWith(str(W_DOT_PNG))) return str(W_PNG);
|
||||||
|
else if (filename.endsWith(str(W_DOT_GIF))) return str(W_GIF);
|
||||||
if (filename.endsWith(str(W_DOT_CSS))) return str(W_CSS);
|
else if (filename.endsWith(str(W_DOT_JPG))) return str(W_JPG);
|
||||||
|
else if (filename.endsWith(str(W_DOT_ICON))) return str(W_ICON);
|
||||||
if (filename.endsWith(str(W_DOT_JS))) return str(W_JS);
|
else if (filename.endsWith(str(W_DOT_XML))) return str(W_XML);
|
||||||
|
else if (filename.endsWith(str(W_DOT_PDF))) return str(W_XPDF);
|
||||||
if (filename.endsWith(str(W_DOT_PNG))) return str(W_PNG);
|
else if (filename.endsWith(str(W_DOT_ZIP))) return str(W_XZIP);
|
||||||
|
else if (filename.endsWith(str(W_DOT_JSON))) return str(W_JSON);
|
||||||
if (filename.endsWith(str(W_DOT_GIF))) return str(W_GIF);
|
else return str(W_TXT);
|
||||||
|
|
||||||
if (filename.endsWith(str(W_DOT_JPG))) return str(W_JPG);
|
|
||||||
|
|
||||||
if (filename.endsWith(str(W_DOT_ICON))) return str(W_ICON);
|
|
||||||
|
|
||||||
if (filename.endsWith(str(W_DOT_XML))) return str(W_XML);
|
|
||||||
|
|
||||||
if (filename.endsWith(str(W_DOT_PDF))) return str(W_XPDF);
|
|
||||||
|
|
||||||
if (filename.endsWith(str(W_DOT_ZIP))) return str(W_XZIP);
|
|
||||||
|
|
||||||
if (filename.endsWith(str(W_DOT_JSON))) return str(W_JSON);
|
|
||||||
|
|
||||||
return str(W_TXT);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool handleFileRead(String path) {
|
bool handleFileRead(String path) {
|
||||||
@@ -173,66 +159,6 @@ bool handleFileRead(String path) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
void handleFileUpload() {
|
|
||||||
// only allow uploads on /edit address
|
|
||||||
if (server.uri() != "/edit")
|
|
||||||
return;
|
|
||||||
|
|
||||||
HTTPUpload& upload = server.upload();
|
|
||||||
if (upload.status == UPLOAD_FILE_START) {
|
|
||||||
String filename = upload.filename;
|
|
||||||
if (!filename.charAt(0) == SLASH) filename = String(SLASH) + filename;
|
|
||||||
//Serial.print("handleFileUpload Name: ");
|
|
||||||
//Serial.println(filename);
|
|
||||||
fsUploadFile = SPIFFS.open(filename, "w");
|
|
||||||
filename = String();
|
|
||||||
} else if (upload.status == UPLOAD_FILE_WRITE) {
|
|
||||||
//Serial.print("handleFileUpload Data: ");
|
|
||||||
//Serial.println(upload.currentSize);
|
|
||||||
if (fsUploadFile)
|
|
||||||
fsUploadFile.write(upload.buf, upload.currentSize);
|
|
||||||
} else if (upload.status == UPLOAD_FILE_END) {
|
|
||||||
if (fsUploadFile)
|
|
||||||
fsUploadFile.close();
|
|
||||||
//Serial.print("handleFileUpload Size: ");
|
|
||||||
//Serial.println(upload.totalSize);
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
void handleFileDelete() {
|
|
||||||
if (server.args() == 0)
|
|
||||||
return server.send(500, str(W_TXT), str(W_BAD_ARGS));
|
|
||||||
|
|
||||||
String path = server.arg(0);
|
|
||||||
//Serial.println("handleFileDelete: " + path);
|
|
||||||
if (path == String(SLASH))
|
|
||||||
return server.send(500, str(W_TXT), str(W_BAD_PATH));
|
|
||||||
if (!SPIFFS.exists(path))
|
|
||||||
return server.send(404, str(W_TXT), str(W_FILE_NOT_FOUND));
|
|
||||||
SPIFFS.remove(path);
|
|
||||||
server.send(200, str(W_TXT), String());
|
|
||||||
}*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
void handleFileCreate() {
|
|
||||||
if (server.args() == 0)
|
|
||||||
return server.send(500, str(W_TXT), str(W_BAD_ARGS));
|
|
||||||
|
|
||||||
String path = server.arg(0);
|
|
||||||
//Serial.println("handleFileCreate: " + path);
|
|
||||||
if (path == String(SLASH))
|
|
||||||
return server.send(500, str(W_TXT), str(W_BAD_PATH));
|
|
||||||
if (SPIFFS.exists(path))
|
|
||||||
return server.send(500, str(W_TXT), "FILE EXISTS");
|
|
||||||
File file = SPIFFS.open(path, "w");
|
|
||||||
if (file)
|
|
||||||
file.close();
|
|
||||||
else
|
|
||||||
return server.send(500, str(W_TXT), "CREATE FAILED");
|
|
||||||
server.send(200, str(W_TXT), "");
|
|
||||||
}*/
|
|
||||||
void handleFileList() {
|
void handleFileList() {
|
||||||
if (!server.hasArg("dir")) {
|
if (!server.hasArg("dir")) {
|
||||||
server.send(500, str(W_TXT), str(W_BAD_ARGS));
|
server.send(500, str(W_TXT), str(W_BAD_ARGS));
|
||||||
@@ -396,22 +322,6 @@ void startAP(String path, String ssid, String password, uint8_t ch, bool hidden,
|
|||||||
server.send(200, str(W_JSON), attack.getStatusJSON());
|
server.send(200, str(W_JSON), attack.getStatusJSON());
|
||||||
});
|
});
|
||||||
|
|
||||||
/*
|
|
||||||
//load editor
|
|
||||||
server.on("/edit", HTTP_GET, [](){
|
|
||||||
if(!handleFileRead("/edit.htm")) server.send(404, str(W_TXT), "FileNotFound");
|
|
||||||
});
|
|
||||||
|
|
||||||
server.on("/edit", HTTP_PUT, handleFileCreate); //create file
|
|
||||||
server.on("/edit", HTTP_DELETE, handleFileDelete); //delete file
|
|
||||||
|
|
||||||
//first callback is called after the request has ended with all parsed arguments
|
|
||||||
//second callback handles file uploads at that location
|
|
||||||
server.on("/edit", HTTP_POST, [](){
|
|
||||||
server.send(200, str(W_TXT), "");
|
|
||||||
}, handleFileUpload);
|
|
||||||
*/
|
|
||||||
|
|
||||||
// aggressively caching static assets
|
// aggressively caching static assets
|
||||||
server.serveStatic("/js", SPIFFS, String(wifi_config_path + "/js").c_str(), "max-age=86400");
|
server.serveStatic("/js", SPIFFS, String(wifi_config_path + "/js").c_str(), "max-age=86400");
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user