GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-12 17:49:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaning code as urlDecode is automatically done now

Browse Source 
thanks @me-no-dev for pointing out
Change version for tracking latest changes
This commit is contained in:
luc lebosse 2016-07-04 10:39:04 +02:00
parent b1456df090
commit 3575652099
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esp3d/config.h
View File

@ -69,7 +69,7 @@
#include <Arduino.h> #include <Arduino.h>
#include "wifi.h" #include "wifi.h"
//version and sources location //version and sources location
#define FW_VERSION "0.7.51" #define FW_VERSION "0.7.52"
#define REPOSITORY "https://github.com/luc-github/ESP8266" #define REPOSITORY "https://github.com/luc-github/ESP8266"

36
esp3d/webinterface.cpp
View File

@ -1254,8 +1254,8 @@ void handle_password()
//is there a correct list of values? //is there a correct list of values?
if (web_interface->WebServer.hasArg("PASSWORD") && web_interface->WebServer.hasArg("PASSWORD2")) { if (web_interface->WebServer.hasArg("PASSWORD") && web_interface->WebServer.hasArg("PASSWORD2")) {
//Password //Password
sPassword = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("PASSWORD")); sPassword =web_interface->WebServer.arg("PASSWORD");
sPassword2 = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("PASSWORD2")); sPassword2 = web_interface->WebServer.arg("PASSWORD2");
if (!web_interface->isAdminPasswordValid(sPassword.c_str()) ) { if (!web_interface->isAdminPasswordValid(sPassword.c_str()) ) {
msg_alert_error=true; msg_alert_error=true;
smsg.concat(F("Error: Incorrect password<BR>")); smsg.concat(F("Error: Incorrect password<BR>"));
@ -1376,7 +1376,7 @@ void handle_web_interface_configAP()
&& web_interface->WebServer.hasArg("GATEWAY")&& web_interface->WebServer.hasArg("SUBNET") && web_interface->WebServer.hasArg("GATEWAY")&& web_interface->WebServer.hasArg("SUBNET")
&& web_interface->WebServer.hasArg("CHANNEL")) { && web_interface->WebServer.hasArg("CHANNEL")) {
//SSID //SSID
sSSID = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("SSID")); sSSID = web_interface->WebServer.arg("SSID");
if (!web_interface->isSSIDValid(sSSID.c_str())) { if (!web_interface->isSSIDValid(sSSID.c_str())) {
msg_alert_error=true; msg_alert_error=true;
smsg.concat(F("Error: Incorrect SSID<BR>")); smsg.concat(F("Error: Incorrect SSID<BR>"));
@ -1384,7 +1384,7 @@ void handle_web_interface_configAP()
ValuesList.add(FPSTR(VALUE_HAS_ERROR)); ValuesList.add(FPSTR(VALUE_HAS_ERROR));
} }
//Password //Password
sPassword = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("PASSWORD")); sPassword = web_interface->WebServer.arg("PASSWORD");
if (!web_interface->isPasswordValid(sPassword.c_str())) { if (!web_interface->isPasswordValid(sPassword.c_str())) {
msg_alert_error=true; msg_alert_error=true;
smsg.concat(F("Error: Incorrect password<BR>")); smsg.concat(F("Error: Incorrect password<BR>"));
@ -1430,7 +1430,7 @@ void handle_web_interface_configAP()
} }
//IP //IP
sIP = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("IP")); sIP = web_interface->WebServer.arg("IP");
if (!web_interface->isIPValid(sIP.c_str())) { if (!web_interface->isIPValid(sIP.c_str())) {
msg_alert_error=true; msg_alert_error=true;
smsg.concat(F("Error: Incorrect IP fortmat<BR>")); smsg.concat(F("Error: Incorrect IP fortmat<BR>"));
@ -1439,7 +1439,7 @@ void handle_web_interface_configAP()
} }
//Gateway //Gateway
sGW = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("GATEWAY")); sGW = web_interface->WebServer.arg("GATEWAY");
if (!web_interface->isIPValid(sGW.c_str())) { if (!web_interface->isIPValid(sGW.c_str())) {
msg_alert_error=true; msg_alert_error=true;
smsg.concat(F("Error: Incorrect gateway<BR>")); smsg.concat(F("Error: Incorrect gateway<BR>"));
@ -1447,7 +1447,7 @@ void handle_web_interface_configAP()
ValuesList.add(FPSTR(VALUE_HAS_ERROR)); ValuesList.add(FPSTR(VALUE_HAS_ERROR));
} }
//subnet //subnet
sMask = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("SUBNET")); sMask = web_interface->WebServer.arg("SUBNET");
if (!web_interface->isIPValid(sMask.c_str())) { if (!web_interface->isIPValid(sMask.c_str())) {
msg_alert_error=true; msg_alert_error=true;
smsg.concat(F("Error: Incorrect subnet<BR>")); smsg.concat(F("Error: Incorrect subnet<BR>"));
@ -1714,7 +1714,7 @@ void handle_web_interface_configSTA()
&& web_interface->WebServer.hasArg("IP") && web_interface->WebServer.hasArg("GATEWAY")&& web_interface->WebServer.hasArg("SUBNET") && web_interface->WebServer.hasArg("IP") && web_interface->WebServer.hasArg("GATEWAY")&& web_interface->WebServer.hasArg("SUBNET")
&& web_interface->WebServer.hasArg("HOSTNAME")) { && web_interface->WebServer.hasArg("HOSTNAME")) {
//SSID //SSID
sSSID = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("SSID")); sSSID = web_interface->WebServer.arg("SSID");
if (!web_interface->isSSIDValid(sSSID.c_str())) { if (!web_interface->isSSIDValid(sSSID.c_str())) {
msg_alert_error=true; msg_alert_error=true;
smsg.concat(F("Error: Incorrect SSID<BR>")); smsg.concat(F("Error: Incorrect SSID<BR>"));
@ -1723,7 +1723,7 @@ void handle_web_interface_configSTA()
} }
//Password //Password
sPassword = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("PASSWORD")); sPassword = web_interface->WebServer.arg("PASSWORD");
if (!web_interface->isPasswordValid(sPassword.c_str())) { if (!web_interface->isPasswordValid(sPassword.c_str())) {
msg_alert_error=true; msg_alert_error=true;
smsg.concat(F("Error: Incorrect password<BR>")); smsg.concat(F("Error: Incorrect password<BR>"));
@ -1732,7 +1732,7 @@ void handle_web_interface_configSTA()
} }
//Hostname //Hostname
sHostname = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("HOSTNAME")); sHostname = web_interface->WebServer.arg("HOSTNAME");
if (!web_interface->isHostnameValid(sHostname.c_str())) { if (!web_interface->isHostnameValid(sHostname.c_str())) {
msg_alert_error=true; msg_alert_error=true;
smsg.concat(F("Error: Incorrect hostname<BR>")); smsg.concat(F("Error: Incorrect hostname<BR>"));
@ -1757,7 +1757,7 @@ void handle_web_interface_configSTA()
} }
//IP //IP
sIP= web_interface->WebServer.urlDecode(web_interface->WebServer.arg("IP")); sIP= web_interface->WebServer.arg("IP");
if (!web_interface->isIPValid(sIP.c_str())) { if (!web_interface->isIPValid(sIP.c_str())) {
msg_alert_error=true; msg_alert_error=true;
smsg.concat(F("Error: Incorrect IP format<BR>")); smsg.concat(F("Error: Incorrect IP format<BR>"));
@ -1766,7 +1766,7 @@ void handle_web_interface_configSTA()
} }
//Gateway //Gateway
sGW = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("GATEWAY")); sGW = web_interface->WebServer.arg("GATEWAY");
if (!web_interface->isIPValid(sGW.c_str())) { if (!web_interface->isIPValid(sGW.c_str())) {
msg_alert_error=true; msg_alert_error=true;
smsg.concat(F("Error: Incorrect gateway<BR>")); smsg.concat(F("Error: Incorrect gateway<BR>"));
@ -1774,7 +1774,7 @@ void handle_web_interface_configSTA()
ValuesList.add(FPSTR(VALUE_HAS_ERROR)); ValuesList.add(FPSTR(VALUE_HAS_ERROR));
} }
//subnet //subnet
sMask = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("SUBNET")); sMask = web_interface->WebServer.arg("SUBNET");
if (!web_interface->isIPValid(sMask.c_str())) { if (!web_interface->isIPValid(sMask.c_str())) {
msg_alert_error=true; msg_alert_error=true;
smsg.concat(F("Error: Incorrect subnet<BR>")); smsg.concat(F("Error: Incorrect subnet<BR>"));
@ -2724,7 +2724,7 @@ void handleFileList()
if(web_interface->WebServer.hasArg("action")) { if(web_interface->WebServer.hasArg("action")) {
if(web_interface->WebServer.arg("action")=="delete" && web_interface->WebServer.hasArg("filename")) { if(web_interface->WebServer.arg("action")=="delete" && web_interface->WebServer.hasArg("filename")) {
String filename; String filename;
filename = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("filename")); filename = web_interface->WebServer.arg("filename");
if(!SPIFFS.exists(filename)) { if(!SPIFFS.exists(filename)) {
status="Cannot delete, file not found!"; status="Cannot delete, file not found!";
} else { } else {
@ -2887,13 +2887,13 @@ void handle_login()
//check is it is a submission or a display //check is it is a submission or a display
smsg=""; smsg="";
if (web_interface->WebServer.hasArg("return")) { if (web_interface->WebServer.hasArg("return")) {
sReturn = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("return")); sReturn = web_interface->WebServer.arg("return");
} }
if (web_interface->WebServer.hasArg("SUBMIT")) { if (web_interface->WebServer.hasArg("SUBMIT")) {
//is there a correct list of values? //is there a correct list of values?
if ( web_interface->WebServer.hasArg("PASSWORD")&& web_interface->WebServer.hasArg("USER")) { if ( web_interface->WebServer.hasArg("PASSWORD")&& web_interface->WebServer.hasArg("USER")) {
//USER //USER
sUser = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("USER")); sUser = web_interface->WebServer.arg("USER");
#ifdef AUTHENTICATION_FEATURE #ifdef AUTHENTICATION_FEATURE
if (sUser!="admin") { if (sUser!="admin") {
msg_alert_error=true; msg_alert_error=true;
@ -2902,7 +2902,7 @@ void handle_login()
ValuesList.add(FPSTR(VALUE_HAS_ERROR)); ValuesList.add(FPSTR(VALUE_HAS_ERROR));
} }
//Password //Password
sPassword = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("PASSWORD")); sPassword = web_interface->WebServer.arg("PASSWORD");
String scurrentPassword; String scurrentPassword;
if (!CONFIG::read_string(EP_ADMIN_PWD, scurrentPassword , MAX_ADMIN_PASSWORD_LENGTH)) { if (!CONFIG::read_string(EP_ADMIN_PWD, scurrentPassword , MAX_ADMIN_PASSWORD_LENGTH)) {
@ -3029,7 +3029,7 @@ void handle_web_command()
if (web_interface->WebServer.hasArg("COM")) { if (web_interface->WebServer.hasArg("COM")) {
String scmd; String scmd;
//decode command //decode command
scmd = web_interface->WebServer.urlDecode(web_interface->WebServer.arg("COM")); scmd = web_interface->WebServer.arg("COM");
scmd.trim(); scmd.trim();
//give an ack - we need to be polite, right ? //give an ack - we need to be polite, right ?
web_interface->WebServer.send(200,"text/plain","Ok"); web_interface->WebServer.send(200,"text/plain","Ok");