Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-14 12:17:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

utils: normalize hostname setting usage

Browse Source
This commit is contained in:
Maxim Prokhorov
2021-10-20 11:38:07 +03:00
parent 51133a69d9
commit 6eaf88c69b
18 changed files with 113 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/espurna/web.cpp
View File

@@ -230,7 +230,7 @@ constexpr unsigned long WebConfigBufferMax { 4096ul };
namespace {
void _webRequestAuth(AsyncWebServerRequest* request) {
request->requestAuthentication(getSetting("hostname", getIdentifier()).c_str(), true);
request->requestAuthentication(getHostname().c_str(), true);
}
void _onReset(AsyncWebServerRequest *request) {
@@ -249,7 +249,7 @@ void _onDiscover(AsyncWebServerRequest *request) {
webLog(request);
const String device = getBoardName();
const String hostname = getSetting("hostname");
const String hostname = getHostname();
StaticJsonBuffer<JSON_OBJECT_SIZE(4)> jsonBuffer;
JsonObject &root = jsonBuffer.createObject();
@@ -297,7 +297,7 @@ void _onGetConfig(AsyncWebServerRequest *request) {
});
*out += "\n}";
auto hostname = getSetting("hostname", getIdentifier());
auto hostname = getHostname();
auto timestamp = String(millis());
#if NTP_SUPPORT
if (ntpSynced()) {
@@ -499,7 +499,7 @@ int _onCertificate(void * arg, const char *filename, uint8_t **buf) {
bool _onAPModeRequest(AsyncWebServerRequest *request) {
if ((WiFi.getMode() & WIFI_AP) > 0) {
const String domain = getSetting("hostname") + ".";
const String domain = getHostname() + ".";
const String host = request->header("Host");
const String ip = WiFi.softAPIP().toString();