FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-14 05:46:35 +00:00
Code Issues Releases Wiki Activity

fhem.pl: json2nameValue: decode unicode in key (Forum #139807)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@29382 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2024-11-30 19:56:32 +00:00
parent 1151dd7255
commit 2f19378054
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/fhem.pl
View File

@ -5460,7 +5460,7 @@ json2nameValue($;$$$$)
my $in2 = $val;
while($in2 =~ m/^\s*"([^"]*)"\s*:\s*(.*)$/s) { # 125340
my ($name,$val) = ($1,$2);
$name =~ s/[^a-z0-9._\-\/]/_/gsi;
($err,$name) = lStr('"'.$name.'"'); #139807
($err,$in2) = eObj(\%r2, $name, $val, $in2, $prefix);
return ($err,undef) if($err);
$in2 =~ s/^\s*,\s*//;
@ -6209,8 +6209,11 @@ makeReadingName($) # Convert non-valid characters to _
return $name;
}
my %umlaut = ( '\xc3\xa4'=>'ae',
'\xc3\x84'=>'Ae',
'\xc3\xb6'=>'oe',
'\xc3\x96'=>'Oe',
'\xc3\xbc'=>'ue',
'\xc3\x9c'=>'Ue',
'\xc3\x9f'=>'ss');
map { $name =~ s/$_/$umlaut{$_}/g } keys %umlaut;
$name =~ s/[^a-z0-9._\-\/]/_/gi;