FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 23:06:37 +00:00
Code Issues Releases Wiki Activity

76_MSGMail: Make use of attribute mailtype again (enabling html)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10702 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
gandy92 2016-02-03 07:55:31 +00:00
parent 646af13d47
commit 2223c9200c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 76_MSGMail: Make use of attribute mailtype again (enabling html)
- feature: 49_SSCAM: added function "svsinfo" to get informations about - feature: 49_SSCAM: added function "svsinfo" to get informations about
installed SVS-package installed SVS-package
- bugfix: 49_SSCAM: saved Credentials were deleted if a device will be - bugfix: 49_SSCAM: saved Credentials were deleted if a device will be

12
fhem/FHEM/76_MSGMail.pm
View File

@ -14,6 +14,13 @@
# 2015-05-05: Remove dependency on Switch # 2015-05-05: Remove dependency on Switch
# 2012 : Created by rbente # 2012 : Created by rbente
# #
##
#
# Further reading:
#
# http://search.cpan.org/~yves/MIME-Lite-3.01/lib/MIME/Lite.pm
#
#
package main; package main;
use strict; use strict;
@ -260,7 +267,7 @@ my %MSGMail_params = (
'to' => {'attr'=>'to', 'default'=>'', 'required'=>1, 'set'=>1}, 'to' => {'attr'=>'to', 'default'=>'', 'required'=>1, 'set'=>1},
'subject' => {'attr'=>'subject', 'default'=>'', 'required'=>1, 'set'=>1}, 'subject' => {'attr'=>'subject', 'default'=>'', 'required'=>1, 'set'=>1},
'cc' => {'attr'=>'cc', 'default'=>'', 'required'=>0, 'set'=>1}, 'cc' => {'attr'=>'cc', 'default'=>'', 'required'=>0, 'set'=>1},
'mtype' => {'attr'=>'mtype', 'default'=>'plain', 'required'=>1, 'set'=>1}, 'mtype' => {'attr'=>'mailtype', 'default'=>'plain', 'required'=>1, 'set'=>1},
'authfile' => {'attr'=>'authfile', 'default'=>'', 'required'=>1, 'set'=>0}, 'authfile' => {'attr'=>'authfile', 'default'=>'', 'required'=>1, 'set'=>0},
'smtphost' => {'attr'=>'smtphost', 'default'=>'', 'required'=>1, 'set'=>0}, 'smtphost' => {'attr'=>'smtphost', 'default'=>'', 'required'=>1, 'set'=>0},
'smtpport' => {'attr'=>'smtpport', 'default'=>'465', 'required'=>1, 'set'=>0}, 'smtpport' => {'attr'=>'smtpport', 'default'=>'465', 'required'=>1, 'set'=>0},
@ -277,7 +284,7 @@ sub MSGMail_send($$;$)
{ {
$params{$key} = AttrVal($name, $MSGMail_params{$key}->{attr}, $MSGMail_params{$key}->{default}); $params{$key} = AttrVal($name, $MSGMail_params{$key}->{attr}, $MSGMail_params{$key}->{default});
$params{$key} = $extparamref->{$key} if (exists $extparamref->{$key} && $MSGMail_params{$key}->{set}); $params{$key} = $extparamref->{$key} if (exists $extparamref->{$key} && $MSGMail_params{$key}->{set});
#Log3 $name, 0, "param $key is now '".$params{$key}."'"; Log3 $name, 4, "$name: param $key is now '".$params{$key}."' (attribute '".$MSGMail_params{$key}->{attr}."')";
} }
my $mailtype = "text/plain"; my $mailtype = "text/plain";
@ -286,6 +293,7 @@ sub MSGMail_send($$;$)
$params{mailtype} = $mailtype; $params{mailtype} = $mailtype;
$params{name} = $name; $params{name} = $name;
$params{msgtext} = $msgtext; $params{msgtext} = $msgtext;
Log3 $name, 4, "$name: mailtype is $mailtype";
my @err = (); my @err = ();
foreach my $key (keys(%MSGMail_params)) foreach my $key (keys(%MSGMail_params))