From 200c0bfddd5ddd8e92172178f9036b2a45db94e1 Mon Sep 17 00:00:00 2001 From: loredo Date: Tue, 18 Oct 2016 08:39:35 +0000 Subject: [PATCH] 70_Pushover.pm: improved userkey and device handling for single messages git-svn-id: https://svn.fhem.de/fhem/trunk@12371 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/70_Pushover.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/70_Pushover.pm b/fhem/FHEM/70_Pushover.pm index 43082f4c5..2bffa3bb0 100644 --- a/fhem/FHEM/70_Pushover.pm +++ b/fhem/FHEM/70_Pushover.pm @@ -820,13 +820,14 @@ sub Pushover_SetMessage { # check if we got a user or group key as device and use it as # user-key instead of hash->USER_KEY - if ( $values{device} =~ /^([A-Za-z0-9]{30})(:([A-Za-z0-9_-]+))?$/s ) { - $values{USER_KEY} = $1; - $values{device} = $3; + if ( $values{device} =~ /^([A-Za-z0-9]{30})?:?([A-Za-z0-9_-]*)?$/s ) { + $values{USER_KEY} = $1 if ( $1 ne "" ); + $values{device} = $2; return $hash->{helper}{FAILED_USERKEYS}{ $values{USER_KEY} } - if ( - defined( $hash->{helper}{FAILED_USERKEYS}{ $values{USER_KEY} } ) ); + if ( $values{USER_KEY} + && defined( $hash->{helper}{FAILED_USERKEYS}{ $values{USER_KEY} } ) + ); } # Check if all mandatory arguments are filled: