From 7583bbb5a92d1cb7c3e3c44db02c0efb4a9176fb Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Tue, 22 Nov 2016 23:24:49 +0000 Subject: [PATCH] 70_Pushover: fix legacy syntax support git-svn-id: https://svn.fhem.de/fhem/trunk@12632 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/70_Pushover.pm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/70_Pushover.pm b/fhem/FHEM/70_Pushover.pm index 7c5000b31..cb7f25afa 100644 --- a/fhem/FHEM/70_Pushover.pm +++ b/fhem/FHEM/70_Pushover.pm @@ -194,13 +194,15 @@ sub Pushover_Set($@) { return Pushover_SetMessage2( $hash, $cmd, $a, $h ) if ( $cmd eq 'glance' - || ( $cmd eq 'msg' - && ( join( " ", @args ) !~ /^(".*"|'.*').*$/ || defined($h) ) ) + || ( + $cmd eq 'msg' + && ( join( " ", @args ) !~ m/^(".*"|'.*').*$/ + || ( defined($h) && keys %{$h} > 0 ) ) + ) ); return Pushover_SetMessage( $hash, @args ) if ( $cmd eq 'msg' ); - } #------------------------------------------------------------------------------ @@ -718,6 +720,8 @@ sub Pushover_SetMessage { my $name = $hash->{NAME}; my %values = (); + Log3 $name, 5, "Pushover $name: called function Pushover_SetMessage()"; + #Set defaults $values{title} = AttrVal( $hash->{NAME}, "title", "" ); $values{message} = ""; @@ -1040,6 +1044,8 @@ sub Pushover_SetMessage2 ($$$$) { my $name = $hash->{NAME}; my %values = (); + Log3 $name, 5, "Pushover $name: called function Pushover_SetMessage2()"; + # general values $values{title} = $h->{title} ? $h->{title} : AttrVal( $hash->{NAME}, "title", "" );