From cca0efc6bf788899f92d5e14f2bc64df786fc66c Mon Sep 17 00:00:00 2001
From: jpawlowski <jpawlowski@users.noreply.github.com>
Date: Wed, 4 Nov 2015 15:21:02 +0000
Subject: [PATCH] 75_MSG: allow direct use of sub-recipient

git-svn-id: https://svn.fhem.de/fhem/trunk@9779 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/75_MSG.pm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

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