diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h index 7085f0b56..9cf907e22 100644 --- a/tasmota/language/af_AF.h +++ b/tasmota/language/af_AF.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Webadministrateurwagwoord" #define D_MQTT_ENABLE "MQTT inskakel" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API inskakel" #define D_FRIENDLY_NAME "Vriendelike naam" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h index 2e55b8280..59af27f2c 100644 --- a/tasmota/language/bg_BG.h +++ b/tasmota/language/bg_BG.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Парола на уеб администратора" #define D_MQTT_ENABLE "Активиране на MQTT" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "Активиране на HTTP API" #define D_FRIENDLY_NAME "Приятелско име" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index 4abba8442..6bffd8849 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Heslo Web administrátora" #define D_MQTT_ENABLE "MQTT aktivní" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API aktivní" #define D_FRIENDLY_NAME "Friendly Name" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index 388abd2f2..d0fccd6ca 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Passwort für Web Oberfläche" #define D_MQTT_ENABLE "MQTT aktivieren" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API aktivieren" #define D_FRIENDLY_NAME "Name [friendly name]" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index d6254a5c8..e71ee964a 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Κωδικός διαχειριστή" #define D_MQTT_ENABLE "Ενεργοποίηση MQTT" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "Ενεργοποίηση HTTP API" #define D_FRIENDLY_NAME "Φιλική ονομασία" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index 8ab8fcae5..40986f104 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Web Admin Password" #define D_MQTT_ENABLE "MQTT enable" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API enable" #define D_FRIENDLY_NAME "Friendly Name" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h index 22ff7fe0e..239cb2ac7 100644 --- a/tasmota/language/es_ES.h +++ b/tasmota/language/es_ES.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Clave Administrador Web" #define D_MQTT_ENABLE "Habilitar MQTT" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "Habilitar HTTP API" #define D_FRIENDLY_NAME "Nombre Amigable" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index 6eb7e9e39..a63b252c0 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Mot de passe Web Admin" #define D_MQTT_ENABLE "MQTT activé" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API activé" #define D_FRIENDLY_NAME "Surnom" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h index 50f46a471..3984dc0c5 100644 --- a/tasmota/language/fy_NL.h +++ b/tasmota/language/fy_NL.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Web Admin Wachtwurd" #define D_MQTT_ENABLE "MQTT ynskeakele" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API ynskeakele" #define D_FRIENDLY_NAME "Freonlike namme" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index dc35190ee..eba8fa655 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "סיסמת מנהל" #define D_MQTT_ENABLE "MQTT אפשר" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API אפשר" #define D_FRIENDLY_NAME "שם ידידותי" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index 95a6599f2..f7d51de3e 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Web admin jelszó" #define D_MQTT_ENABLE "MQTT engedélyezése" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API engedélyezése" #define D_FRIENDLY_NAME "Név" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h index c0e748418..8d76ab9d3 100644 --- a/tasmota/language/it_IT.h +++ b/tasmota/language/it_IT.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Password amministratore web" #define D_MQTT_ENABLE "Abilita MQTT" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "Abilita HTTP API" #define D_FRIENDLY_NAME "Nome amichevole" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Bridge Hue" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index c7683ecf7..5da66f819 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Web Admin 비밀번호" #define D_MQTT_ENABLE "MQTT 사용" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API 사용" #define D_FRIENDLY_NAME "Friendly Name" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index f2830c299..54ed3cc5b 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Web Admin Wachtwoord" #define D_MQTT_ENABLE "MQTT ingeschakeld" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API ingeschakeld" #define D_FRIENDLY_NAME "Beschrijvende naam" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index 5086423f0..d90d6099a 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Hasło administratora" #define D_MQTT_ENABLE "Załącz MQTT" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "Załącz HTTP API" #define D_FRIENDLY_NAME "Nazwa" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Mostek Hue" diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h index 156ce5a8e..e7b0a938f 100644 --- a/tasmota/language/pt_BR.h +++ b/tasmota/language/pt_BR.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Senha de WEB Admin" #define D_MQTT_ENABLE "MQTT habilitado" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API habilitado" #define D_FRIENDLY_NAME "Nome amigável" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index 2f467be6b..4eeb9eb28 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Palavra Chave do Admin WEB" #define D_MQTT_ENABLE "MQTT habilitado" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API habilitado" #define D_FRIENDLY_NAME "Nome amigável" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index 89ae6aaec..e3ec62390 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Parolă Web Admin" #define D_MQTT_ENABLE "Activare MQTT" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "Activare HTTP API" #define D_FRIENDLY_NAME "Friendly Name" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h index 5574d2662..9f58134c1 100644 --- a/tasmota/language/ru_RU.h +++ b/tasmota/language/ru_RU.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Пароль Web администратора" #define D_MQTT_ENABLE "MQTT активен" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API активен" #define D_FRIENDLY_NAME "Дружественное Имя" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index 67330366b..ac554d43e 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Heslo Web administrátora" #define D_MQTT_ENABLE "MQTT aktívne" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API aktívne" #define D_FRIENDLY_NAME "Friendly Name" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index cd9b6ee69..5d46cb0f5 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Webbadmin-lösenord" #define D_MQTT_ENABLE "MQTT aktivera" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API aktivera" #define D_FRIENDLY_NAME "Läsbart namn" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index 05a5202e0..bfdd34f63 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Web Yönetici Şifresi" #define D_MQTT_ENABLE "MQTT aktif" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API aktif" #define D_FRIENDLY_NAME "Kullanıcı Dostu İsim" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h index 87ab4e379..25ffd199c 100644 --- a/tasmota/language/uk_UA.h +++ b/tasmota/language/uk_UA.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Гасло адміністратора Web" #define D_MQTT_ENABLE "MQTT активний" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API активний" #define D_FRIENDLY_NAME "Дружня назва" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Міст Hue" diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h index 1c290ddc2..59efb8330 100644 --- a/tasmota/language/vi_VN.h +++ b/tasmota/language/vi_VN.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "Mật khẩu quản trị Web" #define D_MQTT_ENABLE "Kích hoạt MQTT" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "Kích hoạt HTTP API" #define D_FRIENDLY_NAME "Tên hiển thị thiết bị " #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "Hue Bridge" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index 8470c322a..036f4c352 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -328,6 +328,8 @@ #define D_WEB_ADMIN_PASSWORD "WEB 管理密码" #define D_MQTT_ENABLE "启用 MQTT" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "启用 HTTP API" #define D_FRIENDLY_NAME "昵称" #define D_BELKIN_WEMO "Belkin WeMo" #define D_HUE_BRIDGE "飞利浦 Hue 网桥" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index 317b1aad6..18540574f 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -326,8 +326,10 @@ #define D_ACTIVATE "啟動" #define D_DEVICE_NAME "裝置名稱" #define D_WEB_ADMIN_PASSWORD "網頁上的管理員密碼" -#define D_MQTT_ENABLE "MQTT的啟用" +#define D_MQTT_ENABLE "MQTT 的啟用" #define D_MQTT_TLS_ENABLE "MQTT TLS" +#define D_HTTP_API "HTTP API" +#define D_HTTP_API_ENABLE "HTTP API 的啟用" #define D_FRIENDLY_NAME "暱稱" #define D_BELKIN_WEMO "貝爾金 WeMo" #define D_HUE_BRIDGE "Hue 橋接器" diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino index c728c0fb4..0b518e2ca 100644 --- a/tasmota/support_command.ino +++ b/tasmota/support_command.ino @@ -568,10 +568,11 @@ void CmndStatus(void) if ((0 == payload) || (5 == payload)) { Response_P(PSTR("{\"" D_CMND_STATUS D_STATUS5_NETWORK "\":{\"" D_CMND_HOSTNAME "\":\"%s\",\"" D_CMND_IPADDRESS "\":\"%_I\",\"" D_JSON_GATEWAY "\":\"%_I\",\"" D_JSON_SUBNETMASK "\":\"%_I\",\"" D_JSON_DNSSERVER "1\":\"%_I\",\"" D_JSON_DNSSERVER "2\":\"%_I\",\"" - D_JSON_MAC "\":\"%s\",\"" D_CMND_WEBSERVER "\":%d,\"" D_CMND_WIFICONFIG "\":%d,\"" D_CMND_WIFIPOWER "\":%s}}"), + D_JSON_MAC "\":\"%s\",\"" D_CMND_WEBSERVER "\":%d,\"" D_CMND_WIFICONFIG "\":%d,\"" D_CMND_WIFIPOWER "\":%s,\"" D_HTTP_API "\":\"%s\"}}"), NetworkHostname(), (uint32_t)NetworkAddress(), Settings->ipv4_address[1], Settings->ipv4_address[2], Settings->ipv4_address[3], Settings->ipv4_address[4], - NetworkMacAddress().c_str(), Settings->webserver, Settings->sta_config, WifiGetOutputPower().c_str()); + NetworkMacAddress().c_str(), Settings->webserver, Settings->sta_config, WifiGetOutputPower().c_str(), + (Settings->flag5.disable_referer_chk) ? PSTR(D_ENABLED) : PSTR(D_DISABLED) ); CmndStatusResponse(5); } diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino index 27f8bd981..4f3912876 100644 --- a/tasmota/xdrv_01_webserver.ino +++ b/tasmota/xdrv_01_webserver.ino @@ -316,6 +316,7 @@ const char HTTP_FORM_OTHER[] PROGMEM = "
" "

" "
" + "
" "
" "
" "

" @@ -2136,6 +2137,7 @@ void HandleOtherConfiguration(void) { TemplateJson(); WSContentSend_P(HTTP_FORM_OTHER, ResponseData(), (USER_MODULE == Settings->module) ? PSTR(" checked disabled") : "", + (Settings->flag5.disable_referer_chk) ? PSTR(" checked") : "", // SetOption128 - Enable HTTP API (Settings->flag.mqtt_enabled) ? PSTR(" checked") : "", // SetOption3 - Enable MQTT SettingsText(SET_FRIENDLYNAME1), SettingsText(SET_DEVICENAME)); @@ -2186,6 +2188,8 @@ void OtherSaveSettings(void) { cmnd += AddWebCommand(PSTR(D_CMND_WEBPASSWORD "2"), PSTR("wp"), PSTR("\"")); cmnd += F(";" D_CMND_SO "3 "); cmnd += Webserver->hasArg(F("b1")); + cmnd += F(";" D_CMND_SO "128 "); + cmnd += Webserver->hasArg(F("b3")); cmnd += AddWebCommand(PSTR(D_CMND_DEVICENAME), PSTR("dn"), PSTR("\"")); char webindex[5]; char cmnd2[24]; // ";Module 0;Template " @@ -2349,6 +2353,8 @@ void HandleInformation(void) WSContentSend_P(PSTR("}1" D_GATEWAY "}2%_I"), (uint32_t)WiFi.softAPIP()); } WSContentSend_P(PSTR("}1}2 ")); // Empty line + WSContentSend_P(PSTR("}1" D_HTTP_API "}2%s"), Settings->flag5.disable_referer_chk ? PSTR(D_ENABLED) : PSTR(D_DISABLED)); // SetOption 128 + WSContentSend_P(PSTR("}1}2 ")); // Empty line if (Settings->flag.mqtt_enabled) { // SetOption3 - Enable MQTT WSContentSend_P(PSTR("}1" D_MQTT_HOST "}2%s"), SettingsText(SET_MQTT_HOST)); WSContentSend_P(PSTR("}1" D_MQTT_PORT "}2%d"), Settings->mqtt_port);