From d6893dbfc32dda42d049d13757e4e5722e9cab60 Mon Sep 17 00:00:00 2001 From: loredo Date: Fri, 25 Nov 2016 09:39:45 +0000 Subject: [PATCH] 75_MSG.pm: handle unknown TYPE git-svn-id: https://svn.fhem.de/fhem/trunk@12650 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/75_MSG.pm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/75_MSG.pm b/fhem/FHEM/75_MSG.pm index 1324239cf..af9c14bab 100755 --- a/fhem/FHEM/75_MSG.pm +++ b/fhem/FHEM/75_MSG.pm @@ -1703,10 +1703,14 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/ $routeStatus .= "+LOCATION"; } - my $gatewayType = - $type[$i] eq "mail" - ? "fhemMsgMail" - : $defs{$gatewayDev}{TYPE}; + my $gatewayType = ( + $type[$i] eq "mail" ? "fhemMsgMail" + : ( + $defs{$gatewayDev}{TYPE} + ? $defs{$gatewayDev}{TYPE} + : "UNDEFINED" + ) + ); my $defTitle = ""; $defTitle = @@ -2338,7 +2342,8 @@ m/^@?([A-Za-z0-9._]+):([A-Za-z0-9._\-\/@+]*):?([A-Za-z0-9._\-\/@+]*)$/ . " due to absence"; push @type, $fw_residentAbsent; - $forwarded .= "," . $type[$i] . ">" . $fw_residentAbsent + $forwarded .= + "," . $type[$i] . ">" . $fw_residentAbsent if ( $forwarded ne "" ); $forwarded .= $type[$i] . ">" . $fw_residentAbsent if ( $forwarded eq "" );