Skip to content

Commit edce3fc

Browse files
tablatronixtablatronix
authored
Merge pull request #928 from d-a-v/head
hotfix: rename internal HTTP_HEAD to HTTP_HEADER
2 parents 740005b + f26638e commit edce3fc

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

‎WiFiManager.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -420,12 +420,12 @@ void WiFiManager::handleRoot() {
420420
return;
421421
}
422422

423-
String page = FPSTR(HTTP_HEAD);
423+
String page = FPSTR(HTTP_HEADER);
424424
page.replace("{v}", "Options");
425425
page += FPSTR(HTTP_SCRIPT);
426426
page += FPSTR(HTTP_STYLE);
427427
page += _customHeadElement;
428-
page += FPSTR(HTTP_HEAD_END);
428+
page += FPSTR(HTTP_HEADER_END);
429429
page += String(F("<h1>"));
430430
page += _apName;
431431
page += String(F("</h1>"));
@@ -441,12 +441,12 @@ void WiFiManager::handleRoot() {
441441
/** Wifi config page handler */
442442
void WiFiManager::handleWifi(boolean scan) {
443443

444-
String page = FPSTR(HTTP_HEAD);
444+
String page = FPSTR(HTTP_HEADER);
445445
page.replace("{v}", "Config ESP");
446446
page += FPSTR(HTTP_SCRIPT);
447447
page += FPSTR(HTTP_STYLE);
448448
page += _customHeadElement;
449-
page += FPSTR(HTTP_HEAD_END);
449+
page += FPSTR(HTTP_HEADER_END);
450450

451451
if (scan) {
452452
int n = WiFi.scanNetworks();
@@ -636,12 +636,12 @@ void WiFiManager::handleWifiSave() {
636636
optionalIPFromString(&_sta_static_sn, sn.c_str());
637637
}
638638

639-
String page = FPSTR(HTTP_HEAD);
639+
String page = FPSTR(HTTP_HEADER);
640640
page.replace("{v}", "Credentials Saved");
641641
page += FPSTR(HTTP_SCRIPT);
642642
page += FPSTR(HTTP_STYLE);
643643
page += _customHeadElement;
644-
page += FPSTR(HTTP_HEAD_END);
644+
page += FPSTR(HTTP_HEADER_END);
645645
page += FPSTR(HTTP_SAVED);
646646
page += FPSTR(HTTP_END);
647647

@@ -657,12 +657,12 @@ void WiFiManager::handleWifiSave() {
657657
void WiFiManager::handleInfo() {
658658
DEBUG_WM(F("Info"));
659659

660-
String page = FPSTR(HTTP_HEAD);
660+
String page = FPSTR(HTTP_HEADER);
661661
page.replace("{v}", "Info");
662662
page += FPSTR(HTTP_SCRIPT);
663663
page += FPSTR(HTTP_STYLE);
664664
page += _customHeadElement;
665-
page += FPSTR(HTTP_HEAD_END);
665+
page += FPSTR(HTTP_HEADER_END);
666666
page += F("<dl>");
667667
page += F("<dt>Chip ID</dt><dd>");
668668
page += ESP.getChipId();
@@ -698,12 +698,12 @@ void WiFiManager::handleInfo() {
698698
void WiFiManager::handleReset() {
699699
DEBUG_WM(F("Reset"));
700700

701-
String page = FPSTR(HTTP_HEAD);
701+
String page = FPSTR(HTTP_HEADER);
702702
page.replace("{v}", "Info");
703703
page += FPSTR(HTTP_SCRIPT);
704704
page += FPSTR(HTTP_STYLE);
705705
page += _customHeadElement;
706-
page += FPSTR(HTTP_HEAD_END);
706+
page += FPSTR(HTTP_HEADER_END);
707707
page += F("Module will reset in a few seconds.");
708708
page += FPSTR(HTTP_END);
709709

‎WiFiManager.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ extern "C" {
2222
#include "user_interface.h"
2323
}
2424

25-
const char HTTP_HEAD[] PROGMEM = "<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"UTF-8\" name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=no\"/><title>{v}</title>";
25+
const char HTTP_HEADER[] PROGMEM = "<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"UTF-8\" name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=no\"/><title>{v}</title>";
2626
const char HTTP_STYLE[] PROGMEM = "<style>.c{text-align: center;} div,input{padding:5px;font-size:1em;} input{width:95%;} body{text-align: center;font-family:verdana;} button{border:0;border-radius:0.3rem;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%;} .q{float: right;width: 64px;text-align: right;} .l{background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAALVBMVEX///8EBwfBwsLw8PAzNjaCg4NTVVUjJiZDRUUUFxdiZGSho6OSk5Pg4eFydHTCjaf3AAAAZElEQVQ4je2NSw7AIAhEBamKn97/uMXEGBvozkWb9C2Zx4xzWykBhFAeYp9gkLyZE0zIMno9n4g19hmdY39scwqVkOXaxph0ZCXQcqxSpgQpONa59wkRDOL93eAXvimwlbPbwwVAegLS1HGfZAAAAABJRU5ErkJggg==\") no-repeat left center;background-size: 1em;}</style>";
2727
const char HTTP_SCRIPT[] PROGMEM = "<script>function c(l){document.getElementById('s').value=l.innerText||l.textContent;document.getElementById('p').focus();}</script>";
28-
const char HTTP_HEAD_END[] PROGMEM = "</head><body><div style='text-align:left;display:inline-block;min-width:260px;'>";
28+
const char HTTP_HEADER_END[] PROGMEM = "</head><body><div style='text-align:left;display:inline-block;min-width:260px;'>";
2929
const char HTTP_PORTAL_OPTIONS[] PROGMEM = "<form action=\"/wifi\" method=\"get\"><button>Configure WiFi</button></form><br/><form action=\"/0wifi\" method=\"get\"><button>Configure WiFi (No Scan)</button></form><br/><form action=\"/i\" method=\"get\"><button>Info</button></form><br/><form action=\"/r\" method=\"post\"><button>Reset</button></form>";
3030
const char HTTP_ITEM[] PROGMEM = "<div><a href='#p' onclick='c(this)'>{v}</a>&nbsp;<span class='q {i}'>{r}%</span></div>";
3131
const char HTTP_FORM_START[] PROGMEM = "<form method='get' action='wifisave'><input id='s' name='s' length=32 placeholder='SSID'><br/><input id='p' name='p' length=64 type='password' placeholder='password'><br/>";
@@ -125,7 +125,7 @@ class WiFiManager
125125
//const int WM_DONE = 0;
126126
//const int WM_WAIT = 10;
127127

128-
//const String HTTP_HEAD = "<!DOCTYPE html><html lang=\"en\"><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"/><title>{v}</title>";
128+
//const String HTTP_HEADER = "<!DOCTYPE html><html lang=\"en\"><head><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"/><title>{v}</title>";
129129

130130
void setupConfigPortal();
131131
void startWPS();

0 commit comments

Comments
 (0)