FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-27 22:53:29 +00:00
Code Issues Releases Wiki Activity

75_MSG: do not add catchall text additions for message types other than text/push/mail

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13165 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-01-21 10:06:52 +00:00
parent e9efe82de9
commit 9c5b216950
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/75_MSG.pm
View File

@ -1789,14 +1789,16 @@ m/^(absent|disappeared|unauthorized|disconnected|unreachable)$/i
my $loopMsg = $msg; my $loopMsg = $msg;
if ( $catchall == 1 ) { if ( $catchall == 1 ) {
$loopTitle = "Fw: $loopTitle" if ($loopTitle); $loopTitle = "Fw: $loopTitle"
if ( $loopTitle
&& $type[$i] !~ /^(audio|screen)$/ );
$loopMsg = "Forwarded Message: $loopMsg" $loopMsg = "Forwarded Message: $loopMsg"
if ( !$loopTitle ); if ( !$loopTitle );
if ( $type[$i] eq "mail" ) { if ( $type[$i] eq "mail" ) {
$loopMsg .= $loopMsg .=
"\n\n-- \nMail catched from device $device"; "\n\n-- \nMail catched from device $device";
} }
else { elsif ( $type[$i] !~ /^(audio|screen)$/ ) {
$loopMsg .= $loopMsg .=
" ### (Catched from device $device)"; " ### (Catched from device $device)";
} }