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.pm: improved userkey and device handling for single messages

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12371 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-10-18 08:39:35 +00:00
parent c5db95ad47
commit c9099cb39c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/70_Pushover.pm
View File

@ -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: