From 2a8a45865e7f98f22ef10d2cb2e458e5d76fb981 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Thu, 15 Jan 2015 19:07:08 +0000
Subject: [PATCH] FHEMWEB: fix \r\n Problem in Lonpoll data (Forum #32190)

git-svn-id: https://svn.fhem.de/fhem/trunk@7581 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/01_FHEMWEB.pm | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 48d15797e..c1190914a 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -2213,23 +2213,15 @@ FW_makeEdit($$$)
 }
 
 
-my %jsTab = (
-  '\\' => '\\\\',
-  '"'  => '\\"',
-  '\t' => '\\t',
-  '\r' => '\\r',
-  '\n' => '\\n',
-  '\b' => '\\b',
-  '\v' => '\\v'
-);
+my %jsTab = ( 92=>'\\\\', 34=>'\\"', 9=>'\\t', 13=>'\\r', 10=>'\\n' );
 sub
 FW_longpollInfo($$$$)
 {
   my ($dev, $state, $html, $fmt) = @_;
   if($fmt && $fmt eq "JSON") {
-    $dev   =~ s/([\\"\t\r\n\b\v])/$jsTab{$1}/ge;
-    $state =~ s/([\\"\t\r\n\b\v])/$jsTab{$1}/ge;
-    $html  =~ s/([\\"\t\r\n\b\v])/$jsTab{$1}/ge;
+    $dev   =~ s/([\\"\t\r\n])/$jsTab{ord($1)}/ge;
+    $state =~ s/([\\"\t\r\n])/$jsTab{ord($1)}/ge;
+    $html  =~ s/([\\"\t\r\n])/$jsTab{ord($1)}/ge;
     return "[\"$dev\",\"$state\",\"$html\"]";
   } else {
     return "$dev<<$state<<$html";