From a2d546a71d17d87e60563ddfc7bd2f5fa33adc4e Mon Sep 17 00:00:00 2001 From: markusbloch <> Date: Sun, 17 Jul 2016 18:17:46 +0000 Subject: [PATCH] PRESENCE: fix perl warning (Forum: #55673, #55699) git-svn-id: https://svn.fhem.de/fhem/trunk@11810 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/73_PRESENCE.pm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/73_PRESENCE.pm b/fhem/FHEM/73_PRESENCE.pm index 99114296d..a7421a495 100755 --- a/fhem/FHEM/73_PRESENCE.pm +++ b/fhem/FHEM/73_PRESENCE.pm @@ -130,6 +130,8 @@ PRESENCE_Define($$) $hash->{TIMEOUT_NORMAL} = ($4 ne "" ? $4 : 30); $hash->{TIMEOUT_PRESENT} = ($5 ne "" ? $5 : $hash->{TIMEOUT_NORMAL}); + delete($hash->{helper}{ADDRESS}); + if($hash->{helper}{call} =~ /\|/) { my $msg = "The command contains a pipe ( | ) symbol, which is not allowed."; @@ -211,8 +213,9 @@ PRESENCE_Define($$) return $msg; } - delete $hash->{helper}{cachednr} if(defined($hash->{helper}{cachednr})); + delete($hash->{helper}{cachednr}); + return undef; } @@ -298,12 +301,12 @@ PRESENCE_Set($@) elsif(defined($powerCmd) && $a[1] eq "power") { my %specials= ( - "%NAME" => $name, - "%ADDRESS" => $hash->{ADDRESS}, - "%ARGUMENT" => (defined($a[2]) ? $a[2] : "") + '%NAME' => $name, + '%ADDRESS' => (defined($hash->{ADDRESS}) ? $hash->{ADDRESS} : ""), + '%ARGUMENT' => (defined($a[2]) ? $a[2] : "") ); - $powerCmd= EvalSpecials($powerCmd, %specials); + $powerCmd = EvalSpecials($powerCmd, %specials); Log3 $name, 5, "PRESENCE ($name) - executing powerCmd: $powerCmd"; my $return = AnalyzeCommandChain(undef, $powerCmd);