From f9138984bfe1fb5d10082d8ef4dcfeba4044918b Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Sun, 20 Nov 2022 15:07:38 +0100
Subject: [PATCH] Add accept filename extensions to GUI

Add accept filename extensions to GUI file upload input fields (#16875)
---
 CHANGELOG.md                                        |   1 +
 RELEASENOTES.md                                     |   1 +
 tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino |  12 ++++++------
 ....7.9.gbl => MGM210PA32JIA_ncp-uart-sw_6.7.9.ota} | Bin
 tools/fw_TubeZigbee_efr32/readme.md                 |   2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)
 rename tools/fw_TubeZigbee_efr32/{MGM210PA32JIA_ncp-uart-sw_6.7.9.gbl => MGM210PA32JIA_ncp-uart-sw_6.7.9.ota} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e221c91b..85b3cc383 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 - Optional define ``SERIAL_BRIDGE_BUFFER_SIZE`` to set Serial Bridge internal buffer size (Default ESP8266 = 256, ESP32 = 800)
 - Command ``SSerialBuffer 256..SERIAL_BRIDGE_BUFFER_SIZE`` to change serial bridge rx buffer size (#17120)
 - Command ``SetOption35 0..255`` to skip number of received messages in Serial Bridge (default 0) (#17140)
+- Accept filename extensions to GUI file upload input fields (#16875)
 
 ### Breaking Changed
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index acf2fb682..7873568d3 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -126,6 +126,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 - Support for BP1658CJ RGBCW led bulbs like Orein OS0100411267 by Cossid [#17011](https://github.com/arendst/Tasmota/issues/17011)
 - Support for Dingtian x595 shift register based relay boards by Barbudor [#17032](https://github.com/arendst/Tasmota/issues/17032)
 - Support for HMC5883L 3-Axis Digital Compass sensor by Andreas Achtzehn [#17069](https://github.com/arendst/Tasmota/issues/17069)
+- Accept filename extensions to GUI file upload input fields [#16875](https://github.com/arendst/Tasmota/issues/16875)
 - WS2812 and Light ArtNet DMX control over UDP port 6454 [#17059](https://github.com/arendst/Tasmota/issues/17059)
 - Berry ``bytes().setbytes()`` method [#16892](https://github.com/arendst/Tasmota/issues/16892)
 - Berry ``bytes().reverse()`` method [#16977](https://github.com/arendst/Tasmota/issues/16977)
diff --git a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
index b62176159..84018e4f1 100644
--- a/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
+++ b/tasmota/tasmota_xdrv_driver/xdrv_01_9_webserver.ino
@@ -354,7 +354,7 @@ const char HTTP_FORM_UPG[] PROGMEM =
   "<fieldset><legend><b>&nbsp;" D_UPGRADE_BY_FILE_UPLOAD "&nbsp;</b></legend>";
 const char HTTP_FORM_RST_UPG[] PROGMEM =
   "<form method='post' action='u2?fsz=' enctype='multipart/form-data'>"
-  "<br><input type='file' name='u2'><br>"
+  "<br><input type='file' name='u2' accept='%s'><br>"
   "<br><button type='submit' "
   "onclick='eb(\"f1\").style.display=\"none\";eb(\"f2\").style.display=\"block\";this.form.action+=this.form[\"u2\"].files[0].size;this.form.submit();'"
     ">" D_START " %s</button></form>"
@@ -365,7 +365,7 @@ const char HTTP_FORM_RST_UPG[] PROGMEM =
 // upload via factory partition
 const char HTTP_FORM_RST_UPG_FCT[] PROGMEM =
   "<form method='post' action='u2?fsz=' enctype='multipart/form-data'>"
-  "<br><input type='file' name='u2'><br>"
+  "<br><input type='file' name='u2' accept='%s'><br>"
   "<br><button type='submit' "
   "onclick='eb(\"f1\").style.display=\"none\";eb(\"f3\").style.display=\"block\";this.form.action+=this.form[\"u2\"].files[0].size;return upl(this);'"
     ">" D_START " %s</button></form>"
@@ -2296,7 +2296,7 @@ void HandleRestoreConfiguration(void)
   WSContentStart_P(PSTR(D_RESTORE_CONFIGURATION));
   WSContentSendStyle();
   WSContentSend_P(HTTP_FORM_RST);
-  WSContentSend_P(HTTP_FORM_RST_UPG, PSTR(D_RESTORE));
+  WSContentSend_P(HTTP_FORM_RST_UPG, PSTR(".dmp"), PSTR(D_RESTORE));
   if (WifiIsInManagerMode()) {
     WSContentSpaceButton(BUTTON_MAIN);
   } else {
@@ -2566,12 +2566,12 @@ void HandleUpgradeFirmware(void) {
   WSContentSend_P(HTTP_FORM_UPG, SettingsText(SET_OTAURL));
 #ifdef ESP32
   if (EspSingleOtaPartition() && !EspRunningFactoryPartition()) {
-    WSContentSend_P(HTTP_FORM_RST_UPG_FCT, PSTR(D_UPGRADE));
+    WSContentSend_P(HTTP_FORM_RST_UPG_FCT, PSTR(".bin,.ota,.hex"), PSTR(D_UPGRADE));
   } else {
-    WSContentSend_P(HTTP_FORM_RST_UPG, PSTR(D_UPGRADE));
+    WSContentSend_P(HTTP_FORM_RST_UPG, PSTR(".bin"), PSTR(D_UPGRADE));
   }
 #else
-  WSContentSend_P(HTTP_FORM_RST_UPG, PSTR(D_UPGRADE));
+  WSContentSend_P(HTTP_FORM_RST_UPG, PSTR(".bin,.bin.gz,.ota,.hex"), PSTR(D_UPGRADE));
 #endif
   WSContentSpaceButton(BUTTON_MAIN);
   WSContentStop();
diff --git a/tools/fw_TubeZigbee_efr32/MGM210PA32JIA_ncp-uart-sw_6.7.9.gbl b/tools/fw_TubeZigbee_efr32/MGM210PA32JIA_ncp-uart-sw_6.7.9.ota
similarity index 100%
rename from tools/fw_TubeZigbee_efr32/MGM210PA32JIA_ncp-uart-sw_6.7.9.gbl
rename to tools/fw_TubeZigbee_efr32/MGM210PA32JIA_ncp-uart-sw_6.7.9.ota
diff --git a/tools/fw_TubeZigbee_efr32/readme.md b/tools/fw_TubeZigbee_efr32/readme.md
index 20e2929c5..677690b99 100644
--- a/tools/fw_TubeZigbee_efr32/readme.md
+++ b/tools/fw_TubeZigbee_efr32/readme.md
@@ -6,7 +6,7 @@ This firmware is to be used with Tube'z Zigbee EFR32 based gateway:
 
 ### Currently recommended versions
 
-- `MGM210PA32JIA_ncp-uart-sw_6.7.9.gbl` - EZSP version 6.7.9
+- `MGM210PA32JIA_ncp-uart-sw_6.7.9.ota` - EZSP version 6.7.9
 
 The device comes pre-flashed with EZSP 6.9.1_2 but there are unresolved issues with Tasmota and we currently only support 6.7.x. You need to downgrade the flash firmware to 6.7.9. Simply use the **Firmware Upggrade** feature of Tasmota, it will automatically detect that the firmware is for the EFR32 and not for Tasmota.