From 98c92ebeea272e8c6917b2b015784ccca21a13d1 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Fri, 3 Feb 2017 10:55:28 +0000
Subject: [PATCH] fhemweb.js: fix raw definition stuff (Forum #66313)

git-svn-id: https://svn.fhem.de/fhem/trunk@13319 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/01_FHEMWEB.pm  | 1 +
 fhem/www/pgm2/fhemweb.js | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 7b371c36e..31d276b4e 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -1095,6 +1095,7 @@ FW_digestCgi($)
     $pv =~ s/\+/ /g;
     $pv =~ s/%([\dA-F][\dA-F])/chr(hex($1))/ige;
     my ($p,$v) = split("=",$pv, 2);
+    $v = "" if(!defined($v));
 
     # Multiline: escape the NL for fhem
     $v =~ s/[\r]//g if($v && $p && $p ne "data");
diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js
index ef538c952..3de984ada 100644
--- a/fhem/www/pgm2/fhemweb.js
+++ b/fhem/www/pgm2/fhemweb.js
@@ -620,7 +620,7 @@ function
 FW_rawDef()
 {
   $("div.rawDef a").each(function(){       // Help on detail window
-    var dev = FW_getLink(this).split(" ").pop();
+    var dev = FW_getLink(this).split(" ").pop().split("&")[0];
     $(this).unbind("click");
     $(this).attr("href", "#"); // Desktop: show underlined Text
     $(this).removeAttr("onclick");
@@ -891,8 +891,9 @@ FW_longpoll()
               "&timestamp="+new Date().getTime();
   query = addcsrf(query);
 
+  var loc = (""+location).replace(/\?.*/,"");
   if(typeof WebSocket == "function" && FW_longpollType == "websocket") {
-    FW_pollConn = new WebSocket((location+query).replace(/^http/i, "ws"));
+    FW_pollConn = new WebSocket((loc+query).replace(/^http/i, "ws"));
     FW_pollConn.onclose = 
     FW_pollConn.onerror = 
     FW_pollConn.onmessage = FW_doUpdate;