mirror of https://github.com/arendst/Tasmota.git
Merge pull request #12900 from ascillato/WEBUI_HTTP-API-ENABLING
WebUI: Add option for enabling HTTP API
This commit is contained in:
commit
ae67c5fa57
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 网桥"
|
||||
|
|
|
@ -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 橋接器"
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -316,6 +316,7 @@ const char HTTP_FORM_OTHER[] PROGMEM =
|
|||
"<br>"
|
||||
"<label><b>" D_WEB_ADMIN_PASSWORD "</b><input type='checkbox' onclick='sp(\"wp\")'></label><br><input id='wp' type='password' placeholder=\"" D_WEB_ADMIN_PASSWORD "\" value=\"" D_ASTERISK_PWD "\"><br>"
|
||||
"<br>"
|
||||
"<label><input id='b3' type='checkbox'%s><b>" D_HTTP_API_ENABLE "</b></label><br>"
|
||||
"<label><input id='b1' type='checkbox'%s><b>" D_MQTT_ENABLE "</b></label><br>"
|
||||
"<br>"
|
||||
"<label><b>" D_DEVICE_NAME "</b> (%s)</label><br><input id='dn' placeholder=\"\" value=\"%s\"><br>"
|
||||
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue