From f1c916d6ac3a39eb0ee48d44d01e7fea0861e2eb Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Wed, 4 Nov 2015 15:40:12 +0000 Subject: [PATCH] msgSchema: more compatible default mail command for Unix hosts git-svn-id: https://svn.fhem.de/fhem/trunk@9780 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/75_MSG.pm | 4 ---- fhem/FHEM/msgSchema.pm | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/75_MSG.pm b/fhem/FHEM/75_MSG.pm index ceafa9484..813166a86 100755 --- a/fhem/FHEM/75_MSG.pm +++ b/fhem/FHEM/75_MSG.pm @@ -1675,10 +1675,6 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+// ) ) if ( $title eq "-" ); - if ( $type[$i] eq "mail" && $priorityCat ne "" ) { - $loopTitle = "[$priorityCat] $loopTitle"; - } - my $loopMsg = $msg; if ( $catchall == 1 ) { $loopTitle = "Fw: $loopTitle"; diff --git a/fhem/FHEM/msgSchema.pm b/fhem/FHEM/msgSchema.pm index 15ef50d05..709c8ad36 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%\' -t \'%DEVICE%\' -a \'MIME-Version: 1.0\' -a \'Content-Type: text/html; charset=UTF-8\'")}', - 'High' => '{system("echo \'%MSG%\' | /usr/bin/mail -s \'%TITLE%\' -t \'%DEVICE%\' -a \'MIME-Version: 1.0\' -a \'Content-Type: text/html; charset=UTF-8\' -a \'X-Priority: 1 (Highest)\' -a \'X-MSMail-Priority: High\' -a \'Importance: high\'")}', - 'Low' => '{system("echo \'%MSG%\' | /usr/bin/mail -s \'%TITLE%\' -t \'%DEVICE%\' -a \'MIME-Version: 1.0\' -a \'Content-Type: text/html; charset=UTF-8\' -a \'X-Priority: 5 (Lowest)\' -a \'X-MSMail-Priority: Low\' -a \'Importance: low\'")}', + '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%\'")}', }, },