Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

FHEMWEB: fix \r\n Problem in Lonpoll data (Forum #32190)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7581 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-01-15 19:07:08 +00:00
parent 7bb1352b99
commit 2a8a45865e
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/01_FHEMWEB.pm
View File

@ -2213,23 +2213,15 @@ FW_makeEdit($$$)
} }
my %jsTab = ( my %jsTab = ( 92=>'\\\\', 34=>'\\"', 9=>'\\t', 13=>'\\r', 10=>'\\n' );
'\\' => '\\\\',
'"' => '\\"',
'\t' => '\\t',
'\r' => '\\r',
'\n' => '\\n',
'\b' => '\\b',
'\v' => '\\v'
);
sub sub
FW_longpollInfo($$$$) FW_longpollInfo($$$$)
{ {
my ($dev, $state, $html, $fmt) = @_; my ($dev, $state, $html, $fmt) = @_;
if($fmt && $fmt eq "JSON") { if($fmt && $fmt eq "JSON") {
$dev =~ s/([\\"\t\r\n\b\v])/$jsTab{$1}/ge; $dev =~ s/([\\"\t\r\n])/$jsTab{ord($1)}/ge;
$state =~ s/([\\"\t\r\n\b\v])/$jsTab{$1}/ge; $state =~ s/([\\"\t\r\n])/$jsTab{ord($1)}/ge;
$html =~ s/([\\"\t\r\n\b\v])/$jsTab{$1}/ge; $html =~ s/([\\"\t\r\n])/$jsTab{ord($1)}/ge;
return "[\"$dev\",\"$state\",\"$html\"]"; return "[\"$dev\",\"$state\",\"$html\"]";
} else { } else {
return "$dev<<$state<<$html"; return "$dev<<$state<<$html";