Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

70_Pushover: fix legacy syntax support

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12632 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-11-22 23:24:49 +00:00
parent 03e906c6a3
commit 7583bbb5a9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/70_Pushover.pm
View File

@ -194,13 +194,15 @@ sub Pushover_Set($@) {
return Pushover_SetMessage2( $hash, $cmd, $a, $h ) return Pushover_SetMessage2( $hash, $cmd, $a, $h )
if ( if (
$cmd eq 'glance' $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 ) return Pushover_SetMessage( $hash, @args )
if ( $cmd eq 'msg' ); if ( $cmd eq 'msg' );
} }
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -718,6 +720,8 @@ sub Pushover_SetMessage {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my %values = (); my %values = ();
Log3 $name, 5, "Pushover $name: called function Pushover_SetMessage()";
#Set defaults #Set defaults
$values{title} = AttrVal( $hash->{NAME}, "title", "" ); $values{title} = AttrVal( $hash->{NAME}, "title", "" );
$values{message} = ""; $values{message} = "";
@ -1040,6 +1044,8 @@ sub Pushover_SetMessage2 ($$$$) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my %values = (); my %values = ();
Log3 $name, 5, "Pushover $name: called function Pushover_SetMessage2()";
# general values # general values
$values{title} = $values{title} =
$h->{title} ? $h->{title} : AttrVal( $hash->{NAME}, "title", "" ); $h->{title} ? $h->{title} : AttrVal( $hash->{NAME}, "title", "" );