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

75_MSG: allow direct use of sub-recipient

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9779 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2015-11-04 15:21:02 +00:00
parent b3f62ba521
commit cca0efc6bf
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/75_MSG.pm
View File

@ -141,7 +141,7 @@ s/^[\s\t]*([a-z,]*!?(screen|light|audio|text|push|mail)[a-z,!|]*)[\s\t]+//
# check for given recipients # check for given recipients
if ( $msg =~ if ( $msg =~
s/^[\s\t]*([!]?(([A-Za-z0-9%+._-])*@([%+a-z0-9A-Z.-]+))[\w,@.!|]*)[\s\t]+// s/^[\s\t]*([!]?(([A-Za-z0-9%+._-])*@([%+a-z0-9A-Z.-]+))[\w,@.!|:]*)[\s\t]+//
) )
{ {
$recipients = $1; $recipients = $1;
@ -274,6 +274,13 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
$device = $1; $device = $1;
} }
# sub-recipient
my $subRecipient = "";
if ( $device =~ s/^@?(.*):(.*)$// ) {
$device = $1;
$subRecipient = $2;
}
# FATAL ERROR: device does not exist # FATAL ERROR: device does not exist
if ( !defined( $defs{$device} ) if ( !defined( $defs{$device} )
&& $deviceType eq "device" ) && $deviceType eq "device" )
@ -468,10 +475,10 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
foreach my $gatewayDev ( split /,/, foreach my $gatewayDev ( split /,/,
$gatewayDevOr ) $gatewayDevOr )
{ {
my $subRecipient = ""; my $tmpSubRecipient;
if ( $gatewayDev =~ s/:(.*)//) if ( $gatewayDev =~ s/:(.*)//)
{ {
$subRecipient = $1; $tmpSubRecipient = $1;
} }
if ( $type[$i] ne "mail" if ( $type[$i] ne "mail"
@ -1476,10 +1483,9 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
foreach my $gatewayDevOr ( split /\|/, $gatewayDevs ) { foreach my $gatewayDevOr ( split /\|/, $gatewayDevs ) {
foreach my $gatewayDev ( split /,/, $gatewayDevOr ) { foreach my $gatewayDev ( split /,/, $gatewayDevOr ) {
my $subRecipient = "";
if ( $gatewayDev =~ s/:(.*)//) if ( $gatewayDev =~ s/:(.*)//)
{ {
$subRecipient = $1; $subRecipient = $1 if ($subRecipient eq "");
} }
Log3 $logDevice, 5, Log3 $logDevice, 5,