From e795f2a1821e3da08a65de1553170de0a9b45ce0 Mon Sep 17 00:00:00 2001 From: loredo Date: Thu, 5 Nov 2015 10:34:50 +0000 Subject: [PATCH] 75_MSG: remove @ quotation for perl routing commands (forum #354881) git-svn-id: https://svn.fhem.de/fhem/trunk@9786 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/75_MSG.pm | 1 - fhem/FHEM/msgSchema.pm | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/75_MSG.pm b/fhem/FHEM/75_MSG.pm index e145460be..4024ad30f 100755 --- a/fhem/FHEM/75_MSG.pm +++ b/fhem/FHEM/75_MSG.pm @@ -1812,7 +1812,6 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+// # run command undef $@; if ( $cmd =~ s/^[ \t]*\{|\}[ \t]*$//gi ) { - $cmd =~ s/@\w+/\\$&/gi; Log3 $logDevice, 5, "msg $device: $type[$i] route command (Perl): $cmd"; eval $cmd; diff --git a/fhem/FHEM/msgSchema.pm b/fhem/FHEM/msgSchema.pm index 709c8ad36..373eb714f 100755 --- a/fhem/FHEM/msgSchema.pm +++ b/fhem/FHEM/msgSchema.pm @@ -102,9 +102,9 @@ my $db = { 'mail' => { 'fhemMsgMail' => { - 'Normal' => '{system("echo \'%MSG%\' | /usr/bin/mail -s \'%TITLE%\' \'%DEVICE%\'")}', - 'High' => '{system("echo \'%MSG%\' | /usr/bin/mail -s \'[High] %TITLE%\' \'%DEVICE%\'")}', - 'Low' => '{system("echo \'%MSG%\' | /usr/bin/mail -s \'[Low] %TITLE%\' \'%DEVICE%\'")}', + 'Normal' => '{ my $dev=\'%DEVICE%\'; system("echo \'%MSG%\' | /usr/bin/mail -s \'%TITLE%\' \'$dev\'"); }', + 'High' => '{ my $dev=\'%DEVICE%\'; system("echo \'%MSG%\' | /usr/bin/mail -s \'%TITLE%\' \'$dev\'"); }', + 'Low' => '{ my $dev=\'%DEVICE%\'; system("echo \'%MSG%\' | /usr/bin/mail -s \'%TITLE%\' \'$dev\'"); }', }, },