projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SL/Template.pm in eine Datei pro Package aufgeteilt.
[kivitendo-erp.git]
/
SL
/
Mailer.pm
diff --git
a/SL/Mailer.pm
b/SL/Mailer.pm
index
5e28012
..
9ef0b08
100644
(file)
--- a/
SL/Mailer.pm
+++ b/
SL/Mailer.pm
@@
-36,6
+36,8
@@
use SL::Common;
use SL::MIME;
use SL::Template;
use SL::MIME;
use SL::Template;
+use strict;
+
my $num_sent = 0;
sub new {
my $num_sent = 0;
sub new {
@@
-112,7
+114,7
@@
sub send {
$email =~ s/[^\w\.\-\+=@]//ig;
my %temp_form = ( %{ $form }, 'myconfig_email' => $email );
$email =~ s/[^\w\.\-\+=@]//ig;
my %temp_form = ( %{ $form }, 'myconfig_email' => $email );
- my $template =
PlainTextTemplate->new(undef, \%temp_form, $myconfig
);
+ my $template =
SL::Template::create(type => 'PlainText', form => \%temp_form
);
my $sendmail = $template->parse_block($main::sendmail);
if (!open(OUT, $sendmail)) {
my $sendmail = $template->parse_block($main::sendmail);
if (!open(OUT, $sendmail)) {
@@
-184,7
+186,7
@@
$self->{message}
my $application = ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/) ? "text" : "application";
my $content_type = SL::MIME->mime_type_from_ext($filename);
my $application = ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/) ? "text" : "application";
my $content_type = SL::MIME->mime_type_from_ext($filename);
- $content_type = "${application}/$
{self->{format}
}" if (!$content_type && $self->{format});
+ $content_type = "${application}/$
self->{format
}" if (!$content_type && $self->{format});
$content_type ||= 'application/octet-stream';
open(IN, $attachment);
$content_type ||= 'application/octet-stream';
open(IN, $attachment);