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

Blicking/FHEMWEB/structure: better $attr checking (Forum #73490)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14677 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-07-09 11:59:45 +00:00
parent 06608b5221
commit b47a38ca5d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/01_FHEMWEB.pm
View File

@ -2651,7 +2651,7 @@ FW_dev2image($;$)
$state = $d->{STATE} if(!defined($state));
return "" if(!$type || !defined($state));
my $model = $attr{$name}{model} if(defined($attr{$name}{model}));
my $model = AttrVal($name, "model", "");
my (undef, $rstate) = ReplaceEventMap($name, [undef, $state], 0);

2
fhem/FHEM/98_structure.pm
View File

@ -184,7 +184,7 @@ structure_Notify($$)
my %clientstate;
my @structPrio = attrSplit($attr{$me}{clientstate_priority})
if($attr{$me}{clientstate_priority});
if($attr{$me} && $attr{$me}{clientstate_priority});
return "" if($hash->{INSET} && !AttrVal($me, "evaluateSetResult", 0));
return "" if(@{$hash->{".asyncQueue"}}); # Do not trigger during async set

2
fhem/FHEM/Blocking.pm
View File

@ -47,7 +47,7 @@ BC_searchTelnet($)
foreach my $d (sort keys %defs) { #
my $h = $defs{$d};
next if(!$h->{TYPE} || $h->{TYPE} ne "telnet" || $h->{SNAME});
next if($attr{$d}{SSL} ||
next if(AttrVal($d, "SSL", undef) ||
AttrVal($d, "allowfrom", "127.0.0.1") ne "127.0.0.1");
next if($h->{DEF} !~ m/^\d+( global)?$/);
next if($h->{DEF} =~ m/IPV6/);