Merge remote-tracking branch 'calcms/master'
This commit is contained in:
@@ -73,6 +73,7 @@ apt-get install <deb-package>
|
|||||||
libapreq2-3
|
libapreq2-3
|
||||||
libapache2-request-perl
|
libapache2-request-perl
|
||||||
libapache-dbi-perl
|
libapache-dbi-perl
|
||||||
|
libauthen-sasl-perl
|
||||||
libauthen-passphrase-blowfish-perl
|
libauthen-passphrase-blowfish-perl
|
||||||
libcalendar-simple-perl
|
libcalendar-simple-perl
|
||||||
libcrypt-blowfish-perl
|
libcrypt-blowfish-perl
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ use utf8;
|
|||||||
use Email::Sender::Simple();
|
use Email::Sender::Simple();
|
||||||
use Email::Simple();
|
use Email::Simple();
|
||||||
use MIME::Words qw(encode_mimeword);
|
use MIME::Words qw(encode_mimeword);
|
||||||
|
use Encode;
|
||||||
|
|
||||||
sub send($) {
|
sub send($) {
|
||||||
my ($mail) = @_;
|
my ($mail) = @_;
|
||||||
@@ -21,7 +22,7 @@ sub send($) {
|
|||||||
'Reply-To' => $mail->{'Reply-To'},
|
'Reply-To' => $mail->{'Reply-To'},
|
||||||
'Subject' => encode_mimeword($mail->{'Subject'}, 'b', 'UTF-8')
|
'Subject' => encode_mimeword($mail->{'Subject'}, 'b', 'UTF-8')
|
||||||
],
|
],
|
||||||
body => $mail->{'Data'},
|
body => Encode::encode( utf8 => $mail->{'Data'} ),
|
||||||
);
|
);
|
||||||
Email::Sender::Simple->send($email);
|
Email::Sender::Simple->send($email);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -145,6 +145,7 @@ sub sendToken ($$) {
|
|||||||
|
|
||||||
mail::send(
|
mail::send(
|
||||||
{
|
{
|
||||||
|
"From" => $config->{locations}->{email},
|
||||||
"To" => $user->{email},
|
"To" => $user->{email},
|
||||||
"Subject" => "request to change password for $baseUrl",
|
"Subject" => "request to change password for $baseUrl",
|
||||||
"Data" => $content
|
"Data" => $content
|
||||||
|
|||||||
Reference in New Issue
Block a user