From f6e11b25bc5c9f18fe44e859500576a8cb0f2f0c Mon Sep 17 00:00:00 2001 From: markusbloch Date: Mon, 22 Aug 2016 19:40:33 +0000 Subject: [PATCH] FB_CALLMONITOR: minor code optimization git-svn-id: https://svn.fhem.de/fhem/trunk@12058 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/72_FB_CALLMONITOR.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/72_FB_CALLMONITOR.pm b/fhem/FHEM/72_FB_CALLMONITOR.pm index 77362f101..46111a3ef 100755 --- a/fhem/FHEM/72_FB_CALLMONITOR.pm +++ b/fhem/FHEM/72_FB_CALLMONITOR.pm @@ -399,11 +399,15 @@ FB_CALLMONITOR_Read($) } } - if($array[1] eq "CALL") + if($array[1] =~ /^CALL|RING$/) { $hash->{helper}{TEMP}{$array[2]}{external_number} = (defined($external_number) ? $external_number : "unknown"); $hash->{helper}{TEMP}{$array[2]}{external_name} = (defined($reverse_search) ? $reverse_search : "unknown"); $hash->{helper}{TEMP}{$array[2]}{internal_number} = $array[4]; + } + + if($array[1] eq "CALL") + { $hash->{helper}{TEMP}{$array[2]}{external_connection} = $array[6]; $hash->{helper}{TEMP}{$array[2]}{internal_connection} = $connection_type{$array[3]} if(defined($connection_type{$array[3]})); $hash->{helper}{TEMP}{$array[2]}{direction} = "outgoing"; @@ -411,9 +415,6 @@ FB_CALLMONITOR_Read($) if($array[1] eq "RING") { - $hash->{helper}{TEMP}{$array[2]}{external_number} = (defined($external_number) ? $external_number : "unknown"); - $hash->{helper}{TEMP}{$array[2]}{external_name} = (defined($reverse_search) ? $reverse_search : "unknown"); - $hash->{helper}{TEMP}{$array[2]}{internal_number} = $array[4]; $hash->{helper}{TEMP}{$array[2]}{external_connection} = $array[5]; $hash->{helper}{TEMP}{$array[2]}{direction} = "incoming"; } @@ -1781,7 +1782,7 @@ sub FB_CALLMONITOR_encrypt($$) =pod =item helper =item summary provides realtime telephone events of a AVM FRITZ!Box via LAN connection -=item summary_DE stellt Telefonereignisse einer AVM FRITZ!Box via LAN-Verbindung zur Verfügung +=item summary_DE stellt Telefonereignisse einer AVM FRITZ!Box via LAN zur Verfügung =begin html