diff --git a/install/INSTALL.md b/install/INSTALL.md index f6ef974..538afa4 100644 --- a/install/INSTALL.md +++ b/install/INSTALL.md @@ -73,6 +73,7 @@ apt-get install libapreq2-3 libapache2-request-perl libapache-dbi-perl + libauthen-sasl-perl libauthen-passphrase-blowfish-perl libcalendar-simple-perl libcrypt-blowfish-perl diff --git a/lib/calcms/mail.pm b/lib/calcms/mail.pm index be8addc..4b4dc08 100644 --- a/lib/calcms/mail.pm +++ b/lib/calcms/mail.pm @@ -8,6 +8,7 @@ use utf8; use Email::Sender::Simple(); use Email::Simple(); use MIME::Words qw(encode_mimeword); +use Encode; sub send($) { my ($mail) = @_; @@ -21,7 +22,7 @@ sub send($) { 'Reply-To' => $mail->{'Reply-To'}, 'Subject' => encode_mimeword($mail->{'Subject'}, 'b', 'UTF-8') ], - body => $mail->{'Data'}, + body => Encode::encode( utf8 => $mail->{'Data'} ), ); Email::Sender::Simple->send($email); } diff --git a/lib/calcms/password_requests.pm b/lib/calcms/password_requests.pm index d5b8b41..0c0fe3c 100644 --- a/lib/calcms/password_requests.pm +++ b/lib/calcms/password_requests.pm @@ -145,6 +145,7 @@ sub sendToken ($$) { mail::send( { + "From" => $config->{locations}->{email}, "To" => $user->{email}, "Subject" => "request to change password for $baseUrl", "Data" => $content