FHEMWEB.pm: better JSON Escaping
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@7562 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
@@ -2207,14 +2207,23 @@ FW_makeEdit($$$)
|
||||
}
|
||||
|
||||
|
||||
my %jsTab = (
|
||||
'\\' => '\\\\',
|
||||
'"' => '\\"',
|
||||
'\t' => '\\t',
|
||||
'\r' => '\\r',
|
||||
'\n' => '\\n',
|
||||
'\b' => '\\b',
|
||||
'\v' => '\\v'
|
||||
);
|
||||
sub
|
||||
FW_longpollInfo($$$$)
|
||||
{
|
||||
my ($dev, $state, $html, $fmt) = @_;
|
||||
if($fmt && $fmt eq "JSON") {
|
||||
$dev =~ s/([\\"])/\\$1/g;
|
||||
$state =~ s/([\\"])/\\$1/g;
|
||||
$html =~ s/([\\"])/\\$1/g;
|
||||
$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;
|
||||
return "[\"$dev\",\"$state\",\"$html\"]";
|
||||
} else {
|
||||
return "$dev<<$state<<$html";
|
||||
|
||||
Reference in New Issue
Block a user