From a5aa80e20a400be8c72a0d7bee20628dac1119c1 Mon Sep 17 00:00:00 2001
From: Ellert <>
Date: Tue, 14 Feb 2017 16:29:19 +0000
Subject: [PATCH] 98_DOIFtools.pm: fix more webname issues
 https://forum.fhem.de/index.php/topic,63938.msg584824.html#msg584824

git-svn-id: https://svn.fhem.de/fhem/trunk@13412 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED              |  1 +
 fhem/FHEM/98_DOIFtools.pm | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

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 .= "<div class=\"dval\"><br><span title=\"toggle to switch event monitor on/off\">Event monitor: <a href=\"/fhem?detail=$d&amp;cmd.$d=setreading $d .eM $a0\">toggle</a>&nbsp;&nbsp;</span>";
+  $ret .= "<div class=\"dval\"><br><span title=\"toggle to switch event monitor on/off\">Event monitor: <a href=\"$FW_ME?detail=$d&amp;cmd.$d=setreading $d .eM $a0\">toggle</a>&nbsp;&nbsp;</span>";
   $ret .= "Shortcuts: " if (!AttrVal($d,"DOIFtoolsHideModulShortcuts",0) or AttrVal($d,"DOIFtoolsMyShortcuts",""));
   if (!AttrVal($d,"DOIFtoolsHideModulShortcuts",0)) {
     $ret .= "<a href=\"$FW_ME?detail=$d&amp;cmd.$d=reload 98_DOIFtools.pm\">reload DOIFtools</a>&nbsp;&nbsp;" if(ReadingsVal($d,".debug",""));
@@ -438,7 +443,7 @@ sub DOIFtools_Notify($$) {
       $trig .= "DOIF-Version: ".ReadingsVal($pn,"DOIF_version","n/a")."<br>";
       $trig .= CommandList(undef,$sn);
       foreach my $itm (keys %defs) {
-        $trig =~ s,([\[\" ])$itm([\"\:\] ]),$1<a href="/fhem?detail=$itm">$itm</a>$2,g;
+        $trig =~ s,([\[\" ])$itm([\"\:\] ]),$1<a href="$FW_ME?detail=$itm">$itm</a>$2,g;
       }
       CommandTrigger(undef,"$hash->{TYPE}Log $trig");
     }