topaLE
/
ahoy
mirror of https://github.com/lumapu/ahoy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

0.8.141 

* fix compile
pull/1738/merge
lumapu 6 months ago
parent
f90aacc3c9
commit
85f854037a
1 changed files with 22 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      src/web/web.h

36
src/web/web.h
View File

@ -245,7 +245,7 @@ class Web {
if (CHECK_MASK(mConfig->sys.protectionMask, mask)) if (CHECK_MASK(mConfig->sys.protectionMask, mask))
checkProtection(request); checkProtection(request);
AsyncWebServerResponse *response = request->beginResponse(200, F("text/html; charset=UTF-8"), zippedHtml, len); AsyncWebServerResponse *response = beginResponse(request, 200, F("text/html; charset=UTF-8"), zippedHtml, len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
response->addHeader(F("content-type"), "text/html; charset=UTF-8"); response->addHeader(F("content-type"), "text/html; charset=UTF-8");
if(request->hasParam("v")) if(request->hasParam("v"))
@ -343,7 +343,7 @@ class Web {
} }
} }
AsyncWebServerResponse *response = request->beginResponse(200, F("text/html; charset=UTF-8"), login_html, login_html_len); AsyncWebServerResponse *response = beginResponse(request, 200, F("text/html; charset=UTF-8"), login_html, login_html_len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
request->send(response); request->send(response);
} }
@ -354,7 +354,7 @@ class Web {
checkProtection(request); checkProtection(request);
mApp->lock(true); mApp->lock(true);
AsyncWebServerResponse *response = request->beginResponse(200, F("text/html; charset=UTF-8"), system_html, system_html_len); AsyncWebServerResponse *response = beginResponse(request, 200, F("text/html; charset=UTF-8"), system_html, system_html_len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
request->send(response); request->send(response);
} }
@ -363,9 +363,9 @@ class Web {
DPRINTLN(DBG_VERBOSE, F("onColor")); DPRINTLN(DBG_VERBOSE, F("onColor"));
AsyncWebServerResponse *response; AsyncWebServerResponse *response;
if (mConfig->sys.darkMode) if (mConfig->sys.darkMode)
response = request->beginResponse(200, F("text/css"), colorDark_css, colorDark_css_len); response = beginResponse(request, 200, F("text/css"), colorDark_css, colorDark_css_len);
else else
response = request->beginResponse(200, F("text/css"), colorBright_css, colorBright_css_len); response = beginResponse(request, 200, F("text/css"), colorBright_css, colorBright_css_len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
if(request->hasParam("v")) { if(request->hasParam("v")) {
response->addHeader(F("Cache-Control"), F("max-age=604800")); response->addHeader(F("Cache-Control"), F("max-age=604800"));
@ -375,7 +375,7 @@ class Web {
void onCss(AsyncWebServerRequest *request) { void onCss(AsyncWebServerRequest *request) {
DPRINTLN(DBG_VERBOSE, F("onCss")); DPRINTLN(DBG_VERBOSE, F("onCss"));
AsyncWebServerResponse *response = request->beginResponse(200, F("text/css"), style_css, style_css_len); AsyncWebServerResponse *response = beginResponse(request, 200, F("text/css"), style_css, style_css_len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
if(request->hasParam("v")) { if(request->hasParam("v")) {
response->addHeader(F("Cache-Control"), F("max-age=604800")); response->addHeader(F("Cache-Control"), F("max-age=604800"));
@ -386,7 +386,7 @@ class Web {
void onApiJs(AsyncWebServerRequest *request) { void onApiJs(AsyncWebServerRequest *request) {
DPRINTLN(DBG_VERBOSE, F("onApiJs")); DPRINTLN(DBG_VERBOSE, F("onApiJs"));
AsyncWebServerResponse *response = request->beginResponse(200, F("text/javascript"), api_js, api_js_len); AsyncWebServerResponse *response = beginResponse(request, 200, F("text/javascript"), api_js, api_js_len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
if(request->hasParam("v")) if(request->hasParam("v"))
response->addHeader(F("Cache-Control"), F("max-age=604800")); response->addHeader(F("Cache-Control"), F("max-age=604800"));
@ -396,7 +396,7 @@ class Web {
void onGridInfoJson(AsyncWebServerRequest *request) { void onGridInfoJson(AsyncWebServerRequest *request) {
DPRINTLN(DBG_VERBOSE, F("onGridInfoJson")); DPRINTLN(DBG_VERBOSE, F("onGridInfoJson"));
AsyncWebServerResponse *response = request->beginResponse(200, F("application/json; charset=utf-8"), grid_info_json, grid_info_json_len); AsyncWebServerResponse *response = beginResponse(request, 200, F("application/json; charset=utf-8"), grid_info_json, grid_info_json_len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
if(request->hasParam("v")) if(request->hasParam("v"))
response->addHeader(F("Cache-Control"), F("max-age=604800")); response->addHeader(F("Cache-Control"), F("max-age=604800"));
@ -405,7 +405,7 @@ class Web {
void onFavicon(AsyncWebServerRequest *request) { void onFavicon(AsyncWebServerRequest *request) {
static const char favicon_type[] PROGMEM = "image/x-icon"; static const char favicon_type[] PROGMEM = "image/x-icon";
AsyncWebServerResponse *response = request->beginResponse(200, favicon_type, favicon_ico, favicon_ico_len); AsyncWebServerResponse *response = beginResponse(request, 200, favicon_type, favicon_ico, favicon_ico_len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
request->send(response); request->send(response);
} }
@ -418,7 +418,7 @@ class Web {
void onReboot(AsyncWebServerRequest *request) { void onReboot(AsyncWebServerRequest *request) {
mApp->setRebootFlag(); mApp->setRebootFlag();
AsyncWebServerResponse *response = request->beginResponse(200, F("text/html; charset=UTF-8"), system_html, system_html_len); AsyncWebServerResponse *response = beginResponse(request, 200, F("text/html; charset=UTF-8"), system_html, system_html_len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
request->send(response); request->send(response);
} }
@ -426,7 +426,7 @@ class Web {
void showHtml(AsyncWebServerRequest *request) { void showHtml(AsyncWebServerRequest *request) {
checkProtection(request); checkProtection(request);
AsyncWebServerResponse *response = request->beginResponse(200, F("text/html; charset=UTF-8"), system_html, system_html_len); AsyncWebServerResponse *response = beginResponse(request, 200, F("text/html; charset=UTF-8"), system_html, system_html_len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
request->send(response); request->send(response);
} }
@ -443,7 +443,7 @@ class Web {
} }
#endif #endif
AsyncWebServerResponse *response = request->beginResponse(200, F("text/html; charset=UTF-8"), wizard_html, wizard_html_len); AsyncWebServerResponse *response = beginResponse(request, 200, F("text/html; charset=UTF-8"), wizard_html, wizard_html_len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
response->addHeader(F("content-type"), "text/html; charset=UTF-8"); response->addHeader(F("content-type"), "text/html; charset=UTF-8");
request->send(response); request->send(response);
@ -635,7 +635,7 @@ class Web {
mApp->saveSettings((request->arg("reboot") == "on")); mApp->saveSettings((request->arg("reboot") == "on"));
AsyncWebServerResponse *response = request->beginResponse(200, F("text/html; charset=UTF-8"), save_html, save_html_len); AsyncWebServerResponse *response = beginResponse(request, 200, F("text/html; charset=UTF-8"), save_html, save_html_len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
request->send(response); request->send(response);
} }
@ -649,7 +649,7 @@ class Web {
} }
void onAbout(AsyncWebServerRequest *request) { void onAbout(AsyncWebServerRequest *request) {
AsyncWebServerResponse *response = request->beginResponse(200, F("text/html; charset=UTF-8"), about_html, about_html_len); AsyncWebServerResponse *response = beginResponse(request, 200, F("text/html; charset=UTF-8"), about_html, about_html_len);
response->addHeader(F("Content-Encoding"), "gzip"); response->addHeader(F("Content-Encoding"), "gzip");
response->addHeader(F("content-type"), "text/html; charset=UTF-8"); response->addHeader(F("content-type"), "text/html; charset=UTF-8");
if(request->hasParam("v")) { if(request->hasParam("v")) {
@ -673,6 +673,14 @@ class Web {
getPage(request, PROT_MASK_SYSTEM, system_html, system_html_len); getPage(request, PROT_MASK_SYSTEM, system_html, system_html_len);
} }
AsyncWebServerResponse* beginResponse(AsyncWebServerRequest *request, int code, const String& contentType, const uint8_t * content, size_t len, AwsTemplateProcessor callback=nullptr) {
#if defined(ESP32)
return request->beginResponse(code, contentType, content, len);
#else
return request->beginResponse_P(code, contentType, content, len);
#endif
}
#ifdef ENABLE_PROMETHEUS_EP #ifdef ENABLE_PROMETHEUS_EP
// Note // Note

Write Preview
Loading…
Cancel
Save