");
httpMessage += FPSTR(MAIN_MENU_BUTTON);
- webSendPage(haspDevice.get_hostname(), httpMessage.length(), false);
+ webSendHeader(haspDevice.get_hostname(), httpMessage.length(), false);
webServer.sendContent(httpMessage);
}
- // httpMessage.clear();
webSendFooter();
}
#endif // HASP_USE_CONFIG
////////////////////////////////////////////////////////////////////////////////////////////////////
-void httpHandleNotFound()
+static void httpHandleNotFound()
{ // webServer 404
#if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
int statuscode = handleFileRead(webServer.uri());
@@ -2108,11 +2138,11 @@ void httpHandleNotFound()
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-void webHandleFirmware()
+static void webHandleFirmware()
{
if(!httpIsAuthenticated(F("firmware"))) return;
- {
+ { // Send Content
String httpMessage((char*)0);
httpMessage.reserve(HTTP_PAGE_SIZE);
httpMessage += F("
");
@@ -2152,21 +2182,19 @@ void webHandleFirmware()
httpMessage += FPSTR(MAIN_MENU_BUTTON);
- webSendPage(haspDevice.get_hostname(), httpMessage.length(), false);
+ webSendHeader(haspDevice.get_hostname(), httpMessage.length(), false);
webServer.sendContent(httpMessage);
}
- // httpMessage.clear();
webSendFooter();
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-void httpHandleEspFirmware()
+static void httpHandleEspFirmware()
{ // http://plate01/espfirmware
- char url[4];
- memcpy_P(url, PSTR("url"), 4);
-
if(!httpIsAuthenticated(F("espfirmware"))) return;
+ if(!webServer.hasArg(F("url"))) return;
+ const char* url = webServer.arg(F("url")).c_str();
{
String httpMessage((char*)0);
httpMessage.reserve(HTTP_PAGE_SIZE);
@@ -2175,34 +2203,34 @@ void httpHandleEspFirmware()
httpMessage += F("
");
httpMessage += F("
ESP update
Updating ESP firmware from: ");
- httpMessage += webServer.arg(url);
+ httpMessage += url;
- webSendPage(haspDevice.get_hostname(), httpMessage.length(), true);
+ webSendHeader(haspDevice.get_hostname(), httpMessage.length(), true);
webServer.sendContent(httpMessage);
- // httpMessage.clear();
}
webSendFooter();
- LOG_TRACE(TAG_HTTP, F("Updating ESP firmware from: %s"), webServer.arg(url).c_str());
- dispatch_web_update(NULL, webServer.arg(url).c_str(), TAG_HTTP);
+ LOG_TRACE(TAG_HTTP, F("Updating ESP firmware from: %s"), url);
+ dispatch_web_update(NULL, url, TAG_HTTP);
}
////////////////////////////////////////////////////////////////////////////////////////////////////
#if HASP_USE_CONFIG > 0
-void webHandleSaveConfig()
+static void webHandleSaveConfig()
{
if(!httpIsAuthenticated(F("saveConfig"))) return;
+
configWrite();
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-void httpHandleResetConfig()
+static void httpHandleResetConfig()
{ // http://plate01/resetConfig
if(!httpIsAuthenticated(F("resetConfig"))) return;
bool resetConfirmed = webServer.arg(F("confirm")) == F("yes");
- {
+ { // Send Content
String httpMessage((char*)0);
httpMessage.reserve(HTTP_PAGE_SIZE);
httpMessage += F("
");
@@ -2233,14 +2261,16 @@ void httpHandleResetConfig()
add_form_button(httpMessage, F(D_BACK_ICON D_HTTP_CONFIGURATION), F("/config"));
}
- webSendPage(haspDevice.get_hostname(), httpMessage.length(), resetConfirmed);
+ webSendHeader(haspDevice.get_hostname(), httpMessage.length(), resetConfirmed);
webServer.sendContent(httpMessage);
}
webSendFooter();
- if(resetConfirmed) {
- delay(250);
- dispatch_reboot(false); // Do NOT save the current config
+ { // Execute Actions
+ if(resetConfirmed) {
+ // delay(250);
+ dispatch_reboot(false); // Do NOT save the current config
+ }
}
}
#endif // HASP_USE_CONFIG
@@ -2277,7 +2307,7 @@ void httpStop()
}
// Do not keep CSS in memory because it is cached in the browser
-void webSendCss()
+static void webSendCssVars()
{
char filename[32];
strncpy(filename, webServer.uri().c_str(), sizeof(filename));
@@ -2312,7 +2342,7 @@ void webSendCss()
}
// Do not keep JS in memory because it is cached in the browser
-void webSendJavascript()
+static void webSendJavascript()
{
String javascript = F("function aref(t){setTimeout(function() {ref('');}, t*1000)}"
"function ref(a){ var t=new "
@@ -2321,27 +2351,40 @@ void webSendJavascript()
}
////////////////////////////////////////////////////////////////////////////////////////////////////
+static inline void webStartConfigPortal()
+{
+#if HASP_USE_CAPTIVE_PORTAL > 0
+ // if DNSServer is started with "*" for domain name, it will reply with
+ // provided IP to all DNS request
+ dnsServer.start(DNS_PORT, "*", apIP);
+ // replay to all requests with same HTML
+ webServer.onNotFound([]() {
+ webHandleCaptivePortalWifiConfig();
+ // webServer.send(200, "text/html", responseHTML);
+ // webServer.on(F("/"), webHandleWifiConfig);
+ });
+#endif // HASP_USE_CAPTIVE_PORTAL
+
+ webServer.on(F("/"), webHandleWifiConfig);
+ LOG_TRACE(TAG_HTTP, F("Wifi access point"));
+}
+
void httpSetup()
{
// httpSetConfig(settings);
// ask server to track these headers
const char* headerkeys[] = {"Content-Length"}; // "Authentication"
-
- // const char HTTP_SCRIPT[] PROGMEM = "";
- size_t headerkeyssize = sizeof(headerkeys) / sizeof(char*);
+ size_t headerkeyssize = sizeof(headerkeys) / sizeof(char*);
webServer.collectHeaders(headerkeys, headerkeyssize);
- // Shared pages
+ // Shared pages between STA and AP
webServer.on(F("/about"), webHandleAbout);
- webServer.on(F("/vars.css"), webSendCss);
+ webServer.on(F("/vars.css"), webSendCssVars);
webServer.on(F("/js"), webSendJavascript);
webServer.onNotFound(httpHandleNotFound);
#if HASP_USE_WIFI > 0
-
// These two endpoints are needed in STA and AP mode
webServer.on(F("/config"), webHandleConfig);
@@ -2349,19 +2392,7 @@ void httpSetup()
#if HASP_USE_CONFIG > 0
if(WiFi.getMode() != WIFI_STA) {
-#if HASP_USE_CAPTIVE_PORTAL > 0
- // if DNSServer is started with "*" for domain name, it will reply with
- // provided IP to all DNS request
- dnsServer.start(DNS_PORT, "*", apIP);
- // replay to all requests with same HTML
- webServer.onNotFound([]() {
- webHandleCaptivePortalWifiConfig();
- // webServer.send(200, "text/html", responseHTML);
- // webServer.on(F("/"), webHandleWifiConfig);
- });
-#endif
- webServer.on(F("/"), webHandleWifiConfig);
- LOG_TRACE(TAG_HTTP, F("Wifi access point"));
+ webStartConfigPortal();
return;
}