mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

75_MSG: remove @ quotation for perl routing commands (forum #354881)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9786 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
loredo
2015-11-05 10:34:50 +00:00
parent 276235bf9d
commit e795f2a182
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/FHEM/75_MSG.pm
View File

@@ -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;

6
fhem/FHEM/msgSchema.pm
View File

@@ -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\'"); }',
},
},