This commit is contained in:
jomjol
2022-01-12 21:02:05 +01:00
parent 2daf6c8b3f
commit 96bb86536f
6 changed files with 30 additions and 12 deletions

View File

@@ -323,7 +323,7 @@ textarea {
</td>
</tr>
<tr class="expert" id="ex4">
<tr id="Category_Analog_ex4">
<td colspan="4" style="padding-left: 20px;">
<h4><input type="checkbox" id="Category_Analog_enabled" value="1" onclick = 'UpdateAfterCategoryCheck()' unchecked > Analog</h4></td>
</tr>

View File

@@ -7,12 +7,13 @@ function gethost_Version(){
function getbasepath(){
var host = window.location.hostname;
if (((host == "127.0.0.1") || (host == "localhost") || (host == ""))
&& ((window.location.port == "80") || (window.location.port == "")))
// && ((window.location.port == "80") || (window.location.port == ""))
)
{
// host = "http://192.168.2.219"; // jomjol interner test
// host = "http://192.168.178.46"; // jomjol interner test
host = "http://192.168.178.79"; // jomjol interner Real
host = "http://192.168.178.34"; // jomjol interner Real
// host = "http://192.168.43.191";
// host = "."; // jomjol interner localhost
@@ -20,11 +21,11 @@ function getbasepath(){
else
{
host = "http://" + host;
if (window.location.port != "") {
host = host + ":" + window.location.port;
}
}
if (window.location.port != "") {
host = host + ":" + window.location.port;
}
return host;
}

View File

@@ -86,6 +86,7 @@ function ParseConfig() {
param[catname] = new Object();
ParamAddValue(param, catname, "Uri");
ParamAddValue(param, catname, "MainTopic", 1, false);
ParamAddValue(param, catname, "Topic", 1, false);
ParamAddValue(param, catname, "ClientID");
ParamAddValue(param, catname, "user");
ParamAddValue(param, catname, "password");
@@ -157,6 +158,14 @@ function ParseConfig() {
}
aktline++;
}
// Make the downward compatiblity with MQTT (Maintopic --> topic)
if (param["MQTT"]["Topic"]["found"] == true && param["MQTT"]["MainTopic"]["found"] == false)
{
param["MQTT"]["MainTopic"] = param["MQTT"]["Topic"]
}
delete param["MQTT"]["Topic"] // Dient nur der Downwardskompatibilität
}
function ParamAddValue(param, _cat, _param, _anzParam = 1, _isNUMBER = false, _checkRegExList = null){

View File

@@ -1 +1 @@
11.4.0
11.4.1