kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mail.pm: replace MIME::Lite by Email::Sender

Browse Source 
* mail.pm uses Email:sender to use correct encoding on sending utf-8
encoded emails
* notify-events.cgi now uses mail.pm.
This commit is contained in:
Milan
2023-04-23 12:15:18 +02:00
parent 172e036242
commit 3effdd6ef0
3 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/INSTALL.md
View File

@@ -85,14 +85,13 @@ apt-get install <deb-package>
libdate-manip-perl libdate-manip-perl
libdbi-perl libdbi-perl
libdbd-mysql-perl libdbd-mysql-perl
libemail-sender-perl
libencode-perl libencode-perl
libjson-perl libjson-perl
libhtml-formattext-withlinks-andtables-perl libhtml-formattext-withlinks-andtables-perl
libhtml-parser-perl libhtml-parser-perl
libhtml-template-perl libhtml-template-perl
libhtml-template-compiled-perl libhtml-template-compiled-perl
libmime-base64-urlsafe-perl
libmime-lite-perl
libsession-token-perl libsession-token-perl
libtext-multimarkdown-perl libtext-multimarkdown-perl
libtext-wikicreole-perl libtext-wikicreole-perl
@@ -132,7 +131,6 @@ apt-get install <deb-package>
Image::Magick Image::Magick
Image::Magick::Square Image::Magick::Square
JSON JSON
MIME::Lite
ModPerl::Util ModPerl::Util
Session::Token Session::Token
Text::Diff::FormatedHtml Text::Diff::FormatedHtml

26
lib/calcms/mail.pm
View File

@@ -4,22 +4,24 @@ use strict;
use warnings; use warnings;
no warnings 'redefine'; no warnings 'redefine';
use MIME::Lite(); use Email::Sender::Simple();
use Email::Simple();
sub send($) { sub send($) {
my $mail = shift; my ($mail) = @_;
my $msg = MIME::Lite->new( my $email = Email::Simple->create(
'From' => $mail->{'From'}, 'Content-Type' => 'text/plain; charset=utf-8',
'To' => $mail->{'To'}, header => [
'Cc' => $mail->{'Cc'}, 'From' => $mail->{'From'},
'Reply-To' => $mail->{'Reply-To'}, 'To' => $mail->{'To'},
'Subject' => $mail->{'Subject'}, 'Cc' => $mail->{'Cc'},
'Data' => $mail->{'Data'}, 'Reply-To' => $mail->{'Reply-To'},
'Subject' => $mail->{'Subject'}
],
body => $mail->{'Data'},
); );
Email::Sender::Simple->send($email);
$msg->print( \*STDERR );
$msg->send;
} }
# do not delete next line # do not delete next line

23
website/agenda/planung/notify-events.cgi
View File

@@ -3,10 +3,9 @@
use strict; use strict;
use warnings; use warnings;
no warnings 'redefine'; no warnings 'redefine';
use utf8;
use URI::Escape();
use Data::Dumper; use Data::Dumper;
use MIME::Lite();
use params(); use params();
use config(); use config();
@@ -21,6 +20,7 @@ use markup();
use studios(); use studios();
use series(); use series();
use localization(); use localization();
use mail();
binmode STDOUT, ":utf8"; binmode STDOUT, ":utf8";
@@ -164,20 +164,7 @@ sub sendMail {
$mail->{Cc} = $params->{cc} if defined $params->{cc}; $mail->{Cc} = $params->{cc} if defined $params->{cc};
$mail->{Subject} = $params->{subject} if defined $params->{subject}; $mail->{Subject} = $params->{subject} if defined $params->{subject};
$mail->{Data} = $params->{content} if defined $params->{content}; $mail->{Data} = $params->{content} if defined $params->{content};
mail::send($mail);
my $msg = MIME::Lite->new(
'From' => $mail->{'From'},
'To' => $mail->{'To'},
'Cc' => $mail->{'Cc'},
'Reply-To' => $mail->{'Reply-To'},
'Subject' => $mail->{'Subject'},
'Data' => $mail->{'Data'},
);
print '<pre>';
$msg->print( \*STDOUT );
print '</pre>';
$msg->send;
} }
sub getMail { sub getMail {
@@ -215,10 +202,10 @@ sub getMail {
}; };
$mail->{Data} .= "nur zur Erinnerung...\n\n"; $mail->{Data} .= "nur zur Erinnerung...\n\n";
$mail->{Data} .= "am $event->{weekday_name} ist die naechste '$event->{series_name}'-Sendung.\n\n"; $mail->{Data} .= "am $event->{weekday_name} ist die nächste '$event->{series_name}'-Sendung.\n\n";
$mail->{Data} .= $mail->{Data} .=
"$event->{source_base_url}$event->{widget_render_url}/$config->{controllers}->{event}/$event->{event_id}.html\n\n"; "$event->{source_base_url}$event->{widget_render_url}/$config->{controllers}->{event}/$event->{event_id}.html\n\n";
$mail->{Data} .= "Gruss, $request->{user}\n"; $mail->{Data} .= "Gruß, $request->{user}\n";
return $mail; return $mail;
} }