From 1c2db8ca4662f42d2e0da02585a28d73b87db956 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Mon, 26 Apr 2021 10:35:39 +0200
Subject: [PATCH] Minor strstr() refactor

---
 tasmota/support.ino         | 3 +++
 tasmota/support_tasmota.ino | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tasmota/support.ino b/tasmota/support.ino
index 1459810eb..e56b9cf82 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -1403,6 +1403,7 @@ bool ValidModule(uint32_t index)
 }
 
 bool ValidTemplate(const char *search) {
+/*
   char template_name[strlen(SettingsText(SET_TEMPLATE_NAME)) +1];
   char search_name[strlen(search) +1];
 
@@ -1410,6 +1411,8 @@ bool ValidTemplate(const char *search) {
   LowerCase(search_name, search);
 
   return (strstr(template_name, search_name) != nullptr);
+*/
+  return (StrStr_P(SettingsText(SET_TEMPLATE_NAME), search) != nullptr);
 }
 
 String AnyModuleName(uint32_t index)
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 07501638a..c1f086645 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -1149,7 +1149,7 @@ void Every250mSeconds(void)
           }
 #endif  // FIRMWARE_MINIMAL
           if (ota_retry_counter < OTA_ATTEMPTS / 2) {
-            if (strstr_P(TasmotaGlobal.mqtt_data, PSTR(".gz"))) {      // Might be made case insensitive...
+            if (StrStr_P(TasmotaGlobal.mqtt_data, PSTR(".gz"))) {
               ota_retry_counter = 1;
             } else {
               strcat_P(TasmotaGlobal.mqtt_data, PSTR(".gz"));