diff --git a/fhem/CHANGED b/fhem/CHANGED index 0e205a697..312be478d 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 98_DOIFtools: some more webname issues - bugfix: 98_DOIFtools: webname ignored - bugfix: 74_XiaomiFlowerSens: 0.6.8 new set command - feature: 23_LUXTRONIK2: new heatSourceDefrost-Readings diff --git a/fhem/FHEM/98_DOIFtools.pm b/fhem/FHEM/98_DOIFtools.pm index deec37732..8e4c1e60f 100644 --- a/fhem/FHEM/98_DOIFtools.pm +++ b/fhem/FHEM/98_DOIFtools.pm @@ -86,10 +86,15 @@ my $DOIFtoolsJSfuncEM = <<'EOF'; } function delbutton() { - FW_cmd(FW_root+"?cmd={my @d = devspec2array('TYPE=DOIFtools');;return $d[0] ? $d[0] : ''}&XHR=1", function(data){ + var r = $("head").attr("root"); + var myFW_root = FW_root; + if(r) + myFW_root = r; + + FW_cmd(myFW_root+"?cmd={my @d = devspec2array('TYPE=DOIFtools');;return $d[0] ? $d[0] : ''}&XHR=1", function(data){ if (data) { var dn = data; - FW_cmd(FW_root+"?cmd={AttrVal(\""+dn+"\",\"DOIFtoolsEMbeforeReadings\",\"0\")}&XHR=1", function(data){ + FW_cmd(myFW_root+"?cmd={AttrVal(\""+dn+"\",\"DOIFtoolsEMbeforeReadings\",\"0\")}&XHR=1", function(data){ if (data == 1) { var ins = document.getElementsByClassName('makeTable wide readings'); var del = document.getElementById('doiftoolscons'); @@ -307,7 +312,7 @@ sub DOIFtools_fhemwebFn($$$$) { } # Event Monitor my $a0 = ReadingsVal($d,".eM", "off") eq "on" ? "off" : "on"; - $ret .= "

Event monitor: toggle  "; + $ret .= "

Event monitor: toggle  "; $ret .= "Shortcuts: " if (!AttrVal($d,"DOIFtoolsHideModulShortcuts",0) or AttrVal($d,"DOIFtoolsMyShortcuts","")); if (!AttrVal($d,"DOIFtoolsHideModulShortcuts",0)) { $ret .= "reload DOIFtools  " if(ReadingsVal($d,".debug","")); @@ -438,7 +443,7 @@ sub DOIFtools_Notify($$) { $trig .= "DOIF-Version: ".ReadingsVal($pn,"DOIF_version","n/a")."
"; $trig .= CommandList(undef,$sn); foreach my $itm (keys %defs) { - $trig =~ s,([\[\" ])$itm([\"\:\] ]),$1$itm$2,g; + $trig =~ s,([\[\" ])$itm([\"\:\] ]),$1$itm$2,g; } CommandTrigger(undef,"$hash->{TYPE}Log $trig"); }