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

FB_CALLLIST: move validation of defined FB_CALLMONITOR to NofiyFn.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10575 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markusbloch 2016-01-19 16:45:31 +00:00
parent 84c6217371
commit 3b4fa04635
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/72_FB_CALLLIST.pm
View File

@ -76,13 +76,14 @@ sub FB_CALLLIST_Define($$)
my $name = $a[0]; my $name = $a[0];
my $callmonitor = $a[2]; my $callmonitor = $a[2];
return "FB_CALLLIST_define: you must specify a device name for using FB_CALLLIST" if(!defined($callmonitor)); return "wrong define syntax: you must specify a device name for using FB_CALLLIST" if(!defined($callmonitor));
return "wrong define syntax: define <name> FB_CALLLIST <name>" if(@a != 3); return "wrong define syntax: define <name> FB_CALLLIST <name>" if(@a != 3);
return "FB_CALLLIST_define: the selected device $callmonitor does not exist." unless(defined($defs{$callmonitor}));
unless($defs{$callmonitor}->{TYPE} eq "FB_CALLMONITOR") if($init_done)
{ {
Log3 $name, 3, "FB_CALLLIST ($name) - WARNING - selected device $callmonitor ist not of type FB_CALLMONITOR"; return "define error: the selected device $callmonitor does not exist." unless(defined($defs{$callmonitor}));
Log3 $name, 3, "FB_CALLLIST ($name) - WARNING - selected device $callmonitor ist not of type FB_CALLMONITOR" unless($defs{$callmonitor}->{TYPE} eq "FB_CALLMONITOR");
} }
$hash->{FB} = $callmonitor; $hash->{FB} = $callmonitor;
@ -268,6 +269,11 @@ sub FB_CALLLIST_Notify($$)
{ {
if(grep(m/^(?:ATTR $name .*|DELETEATTR $name .*|INITIALIZED|REREADCFG)$/, @{$d->{CHANGED}})) if(grep(m/^(?:ATTR $name .*|DELETEATTR $name .*|INITIALIZED|REREADCFG)$/, @{$d->{CHANGED}}))
{ {
my $callmonitor = $hash->{FB};
Log3 $name, 3, "FB_CALLLIST ($name) - WARNING - the selected device $callmonitor does not exist" unless(defined($defs{$callmonitor}));
Log3 $name, 3, "FB_CALLLIST ($name) - WARNING - selected device $callmonitor ist not of type FB_CALLMONITOR" if(defined($defs{$callmonitor}) and $defs{$callmonitor}->{TYPE} ne "FB_CALLMONITOR");
# delete all outdated calls according to attribute list-type, internal-number-filter and number-of-calls # delete all outdated calls according to attribute list-type, internal-number-filter and number-of-calls
FB_CALLLIST_cleanupList($hash); FB_CALLLIST_cleanupList($hash);