mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FHEMWEB.pm: better JSON Escaping

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@7562 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2015-01-14 07:16:35 +00:00
parent c0d6b815e4
commit b01acf8307
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/01_FHEMWEB.pm
View File

@@ -2207,14 +2207,23 @@ FW_makeEdit($$$)
} }
my %jsTab = (
'\\' => '\\\\',
'"' => '\\"',
'\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/([\\"])/\\$1/g; $dev =~ s/([\\"\t\r\n\b\v])/$jsTab{$1}/ge;
$state =~ s/([\\"])/\\$1/g; $state =~ s/([\\"\t\r\n\b\v])/$jsTab{$1}/ge;
$html =~ s/([\\"])/\\$1/g; $html =~ s/([\\"\t\r\n\b\v])/$jsTab{$1}/ge;
return "[\"$dev\",\"$state\",\"$html\"]"; return "[\"$dev\",\"$state\",\"$html\"]";
} else { } else {
return "$dev<<$state<<$html"; return "$dev<<$state<<$html";