FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-09 20:57:11 +00:00
Code Issues Releases Wiki Activity

73_AutoShuttersControl: Fix uninitialized value within %charHash in substitution iterator

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25223 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2021-11-14 13:13:56 +00:00
parent 8677f131d7
commit 1ff1e5db8c
4 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 73_AutoShuttersControl: Fix uninitialized value within %charHash
in substitution iterator
- bugfix: 88_HMCCU: Fixed ePaper and BSL bugs - bugfix: 88_HMCCU: Fixed ePaper and BSL bugs
- bugfix: 88_HMCCU: Fixed some bugs - bugfix: 88_HMCCU: Fixed some bugs
- bugfix: 73_km200: Allowing port behind IP address - bugfix: 73_km200: Allowing port behind IP address

2
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -1465,7 +1465,7 @@ __END__
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.10.18", "version": "v0.10.19",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

10
fhem/lib/FHEM/Automation/ShuttersControl.pm
View File

@ -775,11 +775,11 @@ sub WriteReadingsShuttersList {
readingsBulkUpdate( readingsBulkUpdate(
$hash, $hash,
'room_' 'room_'
. makeReadingName( AttrVal( $shuttersDev, 'room', 'unsorted' ) ), . ::makeReadingName( AttrVal( $shuttersDev, 'room', 'unsorted' ) ),
ReadingsVal( ReadingsVal(
$name, $name,
'room_' 'room_'
. makeReadingName( . ::makeReadingName(
AttrVal( $shuttersDev, 'room', 'unsorted' ) AttrVal( $shuttersDev, 'room', 'unsorted' )
), ),
'' ''
@ -791,7 +791,7 @@ sub WriteReadingsShuttersList {
ReadingsVal( ReadingsVal(
$name, $name,
'room_' 'room_'
. makeReadingName( . ::makeReadingName(
AttrVal( $shuttersDev, 'room', 'unsorted' ) AttrVal( $shuttersDev, 'room', 'unsorted' )
), ),
'none' 'none'
@ -801,14 +801,14 @@ sub WriteReadingsShuttersList {
readingsBulkUpdate( readingsBulkUpdate(
$hash, $hash,
'room_' 'room_'
. makeReadingName( AttrVal( $shuttersDev, 'room', 'unsorted' ) ), . ::makeReadingName( AttrVal( $shuttersDev, 'room', 'unsorted' ) ),
$shuttersDev $shuttersDev
) )
if ( if (
ReadingsVal( ReadingsVal(
$name, $name,
'room_' 'room_'
. makeReadingName( . ::makeReadingName(
AttrVal( $shuttersDev, 'room', 'unsorted' ) AttrVal( $shuttersDev, 'room', 'unsorted' )
), ),
'none' 'none'

19
fhem/lib/FHEM/Automation/ShuttersControl/Helper.pm
View File

@ -994,25 +994,6 @@ sub IsAfterShuttersManualBlocking {
else { return 1 } else { return 1 }
} }
sub makeReadingName {
my ($rname) = shift;
my %charHash = (
chr(0xe4) => "ae", # ä
chr(0xc4) => "Ae", # Ä
chr(0xfc) => "ue", # ü
chr(0xdc) => "Ue", # Ü
chr(0xf6) => "oe", # ö
chr(0xd6) => "Oe", # Ö
chr(0xdf) => "ss" # ß
);
my $charHashkeys = join( "", keys(%charHash) );
return $rname if ( $rname =~ m{^\./}xms );
$rname =~ s/([$charHashkeys])/$charHash{$1}/xgi;
$rname =~ s/[^a-z0-9._\-\/]/_/xgi;
return $rname;
}
sub IsWe { sub IsWe {
return main::IsWe( shift, shift ); return main::IsWe( shift, shift );
} }