Merge remote-tracking branch 'calcms/master'

install/INSTALL.md

@@ -73,6 +73,7 @@ apt-get install <deb-package>
     libapreq2-3
     libapache2-request-perl
     libapache-dbi-perl
+    libauthen-sasl-perl
     libauthen-passphrase-blowfish-perl
     libcalendar-simple-perl
     libcrypt-blowfish-perl

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);
 }

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