Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-27 19:57:38 +00:00
Code Issues Releases Activity

[Webserver] Remove code duplication send start of page

Browse Source
This commit is contained in:
TD-er
2026-07-12 01:08:00 +02:00
parent 2776ae9516
commit 0e66898524
19 changed files with 37 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/src/WebServer/AdvancedConfigPage.cpp
+1 -4
View File
@@ -37,10 +37,7 @@ void handle_advanced() {
checkRAM(F("handle_advanced"));
#endif
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_TOOLS;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_TOOLS)) { return; }
if (!webArg(F("edit")).isEmpty())
{
src/src/WebServer/ConfigPage.cpp
+1 -5
View File
@@ -34,11 +34,7 @@ void handle_config() {
checkRAM(F("handle_config"));
#endif
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_CONFIG;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_CONFIG)) { return; }
if (web_server.args() != 0)
{
src/src/WebServer/ControllerPage.cpp
+1 -4
View File
@@ -36,10 +36,7 @@ void handle_controllers() {
checkRAM(F("handle_controllers"));
# endif // ifndef BUILD_NO_RAM_TRACKER
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_CONTROLLERS;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_CONTROLLERS)) { return; }
// 'index' value in the URL
uint8_t controllerindex = getFormItemInt(F("index"), 0);
src/src/WebServer/DevicesPage.cpp
+1 -5
View File
@@ -48,11 +48,7 @@ void handle_devices() {
checkRAM(F("handle_devices"));
# endif // ifndef BUILD_NO_RAM_TRACKER
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_DEVICES;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_DEVICES)) { return; }
// char tmpString[41];
src/src/WebServer/ESPEasy_WebServer.cpp
+11
View File
@@ -898,6 +898,17 @@ bool isLoggedIn(bool mustProvideLogin)
return true;
}
bool startStream_send_stdTemplate(uint8_t newNavIndex)
{
if (!isLoggedIn()) { return false; }
navMenuIndex = newNavIndex;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
return true;
}
String getControllerSymbol(uint8_t index)
{
String ret = F("<span style='font-size:20px; background: #00000000;'>&#");
src/src/WebServer/ESPEasy_WebServer.h
+4
View File
@@ -128,6 +128,10 @@ void addTaskValueSelect(const String& name,
// ********************************************************************************
bool isLoggedIn(bool mustProvideLogin = true);
// Check isLoggedIn, set new navIndex and start serving standard template
// Thus not for non-HTML pages.
bool startStream_send_stdTemplate(uint8_t newNavIndex);
String getControllerSymbol(uint8_t index);
/*
src/src/WebServer/FactoryResetPage.cpp
+2 -4
View File
@@ -25,10 +25,8 @@ void handle_factoryreset() {
checkRAM(F("handle_factoryreset"));
#endif
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_TOOLS;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_TOOLS)) { return; }
html_add_form();
html_table_class_normal();
html_TR();
src/src/WebServer/HardwarePage.cpp
+1 -4
View File
@@ -30,10 +30,7 @@ void handle_hardware() {
checkRAM(F("handle_hardware"));
#endif
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_HARDWARE;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_HARDWARE)) { return; }
if (isFormItem(F("pled"))) {
String error;
src/src/WebServer/I2C_Scanner.cpp
+1 -4
View File
@@ -489,10 +489,7 @@ void handle_i2cscanner() {
checkRAM(F("handle_i2cscanner"));
#endif
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_TOOLS;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_TOOLS)) { return; }
int nDevices = 0;
#if !FEATURE_I2C_MULTIPLE
src/src/WebServer/Log.cpp
+1 -4
View File
@@ -21,11 +21,8 @@
// Web Interface log page
// ********************************************************************************
void handle_log() {
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_TOOLS;
if (!startStream_send_stdTemplate(MENU_INDEX_TOOLS)) { return; }
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
html_table_class_normal();
#ifdef WEBSERVER_LOG
src/src/WebServer/NetworkPage.cpp
+1 -5
View File
@@ -35,11 +35,7 @@ void handle_networks()
checkRAM(F("handle_networks"));
# endif // ifndef BUILD_NO_RAM_TRACKER
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_NETWORK;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_NETWORK)) { return; }
// 'index' value in the URL
uint8_t networkindex = getFormItemInt(F("index"), 0);
src/src/WebServer/NotificationPage.cpp
+1 -4
View File
@@ -39,10 +39,7 @@ void handle_notifications() {
checkRAM(F("handle_notifications"));
# endif // ifndef BUILD_NO_RAM_TRACKER
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_NOTIFICATIONS;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_NOTIFICATIONS)) { return; }
struct EventStruct TempEvent;
src/src/WebServer/PinStates.cpp
+1 -4
View File
@@ -75,10 +75,7 @@ void handle_pinstates() {
checkRAM(F("handle_pinstates"));
# endif // ifndef BUILD_NO_RAM_TRACKER
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_TOOLS;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_TOOLS)) { return; }
# ifdef ESP32
html_BR();
src/src/WebServer/SettingsArchive.cpp
+2 -4
View File
@@ -24,10 +24,8 @@ void handle_settingsarchive() {
checkRAM(F("handle_settingsarchive"));
# endif // ifndef BUILD_NO_RAM_TRACKER
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_TOOLS;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_TOOLS)) { return; }
html_add_form();
html_table_class_normal();
html_TR();
src/src/WebServer/SysInfoPage.cpp
+1 -4
View File
@@ -235,13 +235,10 @@ void handle_sysinfo() {
checkRAM(F("handle_sysinfo"));
# endif // ifndef BUILD_NO_RAM_TRACKER
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_TOOLS;
if (!startStream_send_stdTemplate(MENU_INDEX_TOOLS)) { return; }
#ifdef WEBSERVER_GITHUB_COPY
html_reset_copyTextCounter();
#endif
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
addHtml(printWebString);
addHtml(F("<form>"));
src/src/WebServer/SysVarPage.cpp
+1 -3
View File
@@ -41,9 +41,7 @@ void handle_sysvars() {
checkRAM(F("handle_sysvars"));
# endif // ifndef BUILD_NO_RAM_TRACKER
if (!isLoggedIn()) { return; }
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_TOOLS)) { return; }
html_BR();
addHtml(F("<p>This page may load slow.<BR>Do not load too often, since it may affect performance of the node.</p>"));
src/src/WebServer/ToolsPage.cpp
+1 -4
View File
@@ -19,10 +19,7 @@
// Web Interface Tools page
// ********************************************************************************
void handle_tools() {
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_TOOLS;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_TOOLS)) { return; }
String webrequest = webArg(F("cmd"));
src/src/WebServer/UploadPage.cpp
+2 -9
View File
@@ -25,10 +25,7 @@
uploadResult_e uploadResult = uploadResult_e::UploadStarted;
void handle_upload() {
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_TOOLS;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_TOOLS)) { return; }
addHtml(F(
"<form enctype='multipart/form-data' method='post'><p>Upload settings file:<br><input type='file' name='datafile' size='40'></p><div><input class='button link' type='submit' value='Upload'></div><input type='hidden' name='edit' value='1'></form>"));
@@ -46,11 +43,7 @@ void handle_upload_post() {
checkRAM(F("handle_upload_post"));
# endif // ifndef BUILD_NO_RAM_TRACKER
if (!isLoggedIn()) { return; }
navMenuIndex = MENU_INDEX_TOOLS;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_TOOLS)) { return; }
switch (uploadResult) {
case uploadResult_e::Success:
src/src/WebServer/WiFiScanner.cpp
+3 -3
View File
@@ -61,6 +61,7 @@ void handle_wifiscanner() {
checkRAM(F("handle_wifiscanner"));
#endif
// Check for logged in state before potentially interrupting WiFi connection
if (!isLoggedIn()) { return; }
WiFiMode_t cur_wifimode = WiFi.getMode();
@@ -69,9 +70,8 @@ void handle_wifiscanner() {
int8_t scanCompleteStatus = ESPEasy::net::wifi::WiFi_AP_Candidates.scanComplete();
ESPEasy::net::wifi::setWifiMode(cur_wifimode);
navMenuIndex = MENU_INDEX_TOOLS;
TXBuffer.startStream();
sendHeadandTail_stdtemplate(_HEAD);
if (!startStream_send_stdTemplate(MENU_INDEX_TOOLS)) { return; }
html_table_class_multirow();
html_TR();
html_table_header(getLabel(LabelType::SSID));