From 846b166ae99ec7839adc8b7947334e95451d34ed Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar@origin.no>
Date: Thu, 23 Jun 2022 08:12:25 +0200
Subject: [PATCH] MQTT/SSL config re-enabled for ESP8266 in case it actually is
 in use

---
 src/web/AmsWebServer.cpp | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp
index 775a6fc6..6c763027 100644
--- a/src/web/AmsWebServer.cpp
+++ b/src/web/AmsWebServer.cpp
@@ -497,29 +497,25 @@ void AmsWebServer::configMqttHtml() {
 	}
 	html.replace("{f255}", mqtt.payloadFormat == 255 ? "selected"  : "");
 
-	#if defined(ESP8266)
-		html.replace("{sd}", "d-none");
-	#else
-		html.replace("{sd}", "");
-		html.replace("{s}", mqtt.ssl ? "checked" : "");
+	html.replace("{sd}", ""); // Could be used to hide SSL config with "d-none"
+	html.replace("{s}", mqtt.ssl ? "checked" : "");
 
-		if(LittleFS.begin()) {
-			html.replace("{dcu}", LittleFS.exists(FILE_MQTT_CA) ? "none" : "");
-			html.replace("{dcf}", LittleFS.exists(FILE_MQTT_CA) ? "" : "none");
-			html.replace("{deu}", LittleFS.exists(FILE_MQTT_CERT) ? "none" : "");
-			html.replace("{def}", LittleFS.exists(FILE_MQTT_CERT) ? "" : "none");
-			html.replace("{dku}", LittleFS.exists(FILE_MQTT_KEY) ? "none" : "");
-			html.replace("{dkf}", LittleFS.exists(FILE_MQTT_KEY) ? "" : "none");
-			LittleFS.end();
-		} else {
-			html.replace("{dcu}", "");
-			html.replace("{dcf}", "none");
-			html.replace("{deu}", "");
-			html.replace("{def}", "none");
-			html.replace("{dku}", "");
-			html.replace("{dkf}", "none");
-		}
-	#endif
+	if(LittleFS.begin()) {
+		html.replace("{dcu}", LittleFS.exists(FILE_MQTT_CA) ? "none" : "");
+		html.replace("{dcf}", LittleFS.exists(FILE_MQTT_CA) ? "" : "none");
+		html.replace("{deu}", LittleFS.exists(FILE_MQTT_CERT) ? "none" : "");
+		html.replace("{def}", LittleFS.exists(FILE_MQTT_CERT) ? "" : "none");
+		html.replace("{dku}", LittleFS.exists(FILE_MQTT_KEY) ? "none" : "");
+		html.replace("{dkf}", LittleFS.exists(FILE_MQTT_KEY) ? "" : "none");
+		LittleFS.end();
+	} else {
+		html.replace("{dcu}", "");
+		html.replace("{dcf}", "none");
+		html.replace("{deu}", "");
+		html.replace("{def}", "none");
+		html.replace("{dku}", "");
+		html.replace("{dkf}", "none");
+	}
 
 	server.setContentLength(html.length() + HEAD_HTML_LEN + FOOT_HTML_LEN);
 	server.send_P(200, MIME_HTML, HEAD_HTML);