mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-20 19:36:02 +00:00
using AttrVal instead of $attr
git-svn-id: https://svn.fhem.de/fhem/trunk@1131 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
1c25832f96
commit
94c1256cfb
@ -153,7 +153,7 @@ autocreate_Notify($$)
|
|||||||
}
|
}
|
||||||
$hash = $defs{$name};
|
$hash = $defs{$name};
|
||||||
$nrcreated++;
|
$nrcreated++;
|
||||||
my $room = replace_wildcards($hash, $attr{$me}{device_room});
|
my $room = replace_wildcards($hash, AttrVal($me, "device_room", "%TYPE"));
|
||||||
$attr{$name}{room} = $room if($room);
|
$attr{$name}{room} = $room if($room);
|
||||||
|
|
||||||
# BlackList processing
|
# BlackList processing
|
||||||
@ -164,7 +164,7 @@ autocreate_Notify($$)
|
|||||||
last if($blfound);
|
last if($blfound);
|
||||||
|
|
||||||
####################
|
####################
|
||||||
my $fl = replace_wildcards($hash, $attr{$me}{filelog});
|
my $fl = replace_wildcards($hash, AttrVal($me, "filelog", ""));
|
||||||
next if(!$fl);
|
next if(!$fl);
|
||||||
my $flname = "FileLog_$name";
|
my $flname = "FileLog_$name";
|
||||||
delete($defs{$flname}); # If we are re-creating it with createlog.
|
delete($defs{$flname}); # If we are re-creating it with createlog.
|
||||||
@ -186,8 +186,8 @@ autocreate_Notify($$)
|
|||||||
|
|
||||||
|
|
||||||
####################
|
####################
|
||||||
next if(!$attr{$me}{weblink} || !$gplot);
|
next if(!AttrVal($me, "weblink", 1) || !$gplot);
|
||||||
$room = replace_wildcards($hash, $attr{$me}{weblink_room});
|
$room = replace_wildcards($hash, AttrVal($me, "weblink_room", "Plots"));
|
||||||
my $wnr = 1;
|
my $wnr = 1;
|
||||||
foreach my $wdef (split(/,/, $gplot)) {
|
foreach my $wdef (split(/,/, $gplot)) {
|
||||||
next if(!$wdef);
|
next if(!$wdef);
|
||||||
@ -243,7 +243,7 @@ autocreate_Notify($$)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CommandSave(undef, undef) if(!$ret && $nrcreated && $attr{$me}{autosave});
|
CommandSave(undef, undef) if(!$ret && $nrcreated && AttrVal($me,"autosave",1));
|
||||||
return $ret;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user