mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12377 from ascillato/Optional_Captive_Portal 

Allow Captive Portal to be optional
This commit is contained in:
Theo Arends 2021-06-16 08:29:45 +02:00 committed by GitHub
parent db8efced15 35c0e991b6
commit 27f84655fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasmota/xdrv_01_webserver.ino
View File

@ -1017,7 +1017,9 @@ void WebSliderColdWarm(void)
void HandleRoot(void) void HandleRoot(void)
{ {
#ifndef NO_CAPTIVE_PORTAL
if (CaptivePortal()) { return; } // If captive portal redirect instead of displaying the page. if (CaptivePortal()) { return; } // If captive portal redirect instead of displaying the page.
#endif // NO_CAPTIVE_PORTAL
if (Webserver->hasArg(F("rst"))) { if (Webserver->hasArg(F("rst"))) {
WebRestart(0); WebRestart(0);
@ -2941,8 +2943,9 @@ void HandleConsoleRefresh(void)
void HandleNotFound(void) void HandleNotFound(void)
{ {
// AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP "Not found (%s)"), Webserver->uri().c_str()); // AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_HTTP "Not found (%s)"), Webserver->uri().c_str());
#ifndef NO_CAPTIVE_PORTAL
if (CaptivePortal()) { return; } // If captive portal redirect instead of displaying the error page. if (CaptivePortal()) { return; } // If captive portal redirect instead of displaying the error page.
#endif // NO_CAPTIVE_PORTAL
#ifdef USE_EMULATION #ifdef USE_EMULATION
#ifdef USE_EMULATION_HUE #ifdef USE_EMULATION_HUE
@ -2962,6 +2965,7 @@ void HandleNotFound(void)
} }
} }
#ifndef NO_CAPTIVE_PORTAL
/* Redirect to captive portal if we got a request for another domain. Return true in that case so the page handler do not try to handle the request again. */ /* Redirect to captive portal if we got a request for another domain. Return true in that case so the page handler do not try to handle the request again. */
bool CaptivePortal(void) bool CaptivePortal(void)
{ {
@ -2976,6 +2980,7 @@ bool CaptivePortal(void)
} }
return false; return false;
} }
#endif // NO_CAPTIVE_PORTAL
/*********************************************************************************************/ /*********************************************************************************************/