# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
#======================================================================
package Mailer;
use Email::Address;
use Email::MIME::Creator;
+use File::MimeInfo::Magic;
use File::Slurp;
use List::UtilsBy qw(bundle_by);
use SL::DB::EmailJournal;
use SL::DB::EmailJournalAttachment;
use SL::DB::Employee;
-use SL::MIME;
use SL::Template;
use strict;
my $num_sent = 0;
+my %mail_delivery_modules = (
+ sendmail => 'SL::Mailer::Sendmail',
+ smtp => 'SL::Mailer::SMTP',
+);
+
sub new {
my ($type, %params) = @_;
my $self = { %params };
myconfig => \%::myconfig,
);
- my $module = ($::lx_office_conf{mail_delivery}->{method} || 'smtp') ne 'smtp' ? 'SL::Mailer::Sendmail' : 'SL::Mailer::SMTP';
+ my $module = $mail_delivery_modules{ $::lx_office_conf{mail_delivery}->{method} };
eval "require $module" or return undef;
return $module->new(%params);
);
my $attachment_content;
+ my $file_id = 0;
+ my $email_journal = $::instance_conf->get_email_journal;
+
+ $::lxdebug->message(LXDebug->DEBUG2(), "mail5 att=" . $attachment . " email_journal=" . $email_journal . " id=" . $attachment->{id});
if (ref($attachment) eq "HASH") {
- $attributes{filename} = $attachment->{name};
- $attachment_content = $attachment->{content} // eval { read_file($attachment->{filename}) };
+ $attributes{filename} = $attachment->{name};
+ $file_id = $attachment->{id} || '0';
+ $attributes{content_type} = $attachment->{type} || 'application/pdf';
+ $attachment_content = $attachment->{content};
+ $attachment_content = eval { read_file($attachment->{path}) } if !$attachment_content;
} else {
- # strip path
$attributes{filename} = $attachment;
$attributes{filename} =~ s:.*\Q$self->{fileid}\E:: if $self->{fileid};
$attributes{filename} =~ s:.*/::g;
- $attachment_content = eval { read_file($attachment) };
+
+ my $application = ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/) ? 'text' : 'application';
+ $attributes{content_type} = File::MimeInfo::Magic::magic($attachment);
+ $attributes{content_type} ||= "${application}/$self->{format}" if $self->{format};
+ $attributes{content_type} ||= 'application/octet-stream';
+ $attachment_content = eval { read_file($attachment) };
}
- return undef if !defined $attachment_content;
+ return undef if $email_journal > 1 && !defined $attachment_content;
- my $application = ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/) ? 'text' : 'application';
- $attributes{content_type} = SL::MIME->mime_type_from_ext($attributes{filename});
- $attributes{content_type} ||= "${application}/$self->{format}" if $self->{format};
- $attributes{content_type} ||= 'application/octet-stream';
- $attributes{charset} = $self->{charset} if lc $application eq 'text' && $self->{charset};
+ $attachment_content ||= ' ';
+ $attributes{charset} = $self->{charset} if $self->{charset} && ($attributes{content_type} =~ m{^text/});
- return Email::MIME->create(
- attributes => \%attributes,
- body => $attachment_content,
+ $::lxdebug->message(LXDebug->DEBUG2(), "mail6 mtype=" . $attributes{content_type} . " filename=" . $attributes{filename});
+
+ my $ent;
+ if ( $attributes{content_type} eq 'message/rfc822' ) {
+ $ent = Email::MIME->new($attachment_content);
+ $ent->header_str_set('Content-disposition' => 'attachment; filename='.$attributes{filename});
+ } else {
+ $ent = Email::MIME->create(
+ attributes => \%attributes,
+ body => $attachment_content,
+ );
+ }
+
+ push @{ $self->{mail_attachments}} , SL::DB::EmailJournalAttachment->new(
+ name => $attributes{filename},
+ mime_type => $attributes{content_type},
+ content => ( $email_journal > 1 ? $attachment_content : ' '),
+ file_id => $file_id,
);
+
+ return $ent;
}
sub _create_message {
my @parts;
+ push @{ $self->{headers} }, (Type => "multipart/mixed");
+
if ($self->{message}) {
push @parts, Email::MIME->create(
attributes => {
push @parts, grep { $_ } map { $self->_create_attachment_part($_) } @{ $self->{attachments} || [] };
return Email::MIME->create(
- header_str => $self->{headers},
- parts => \@parts,
+ header_str => $self->{headers},
+ parts => \@parts,
);
}
# Create driver for delivery method (sendmail/SMTP)
$self->{driver} = eval { $self->_create_driver };
if (!$self->{driver}) {
- $self->_store_in_journal('failed', 'driver could not be created; check your configuration');
- return "send email : $@";
+ my $error = $@;
+ $self->_store_in_journal('failed', 'driver could not be created; check your configuration & log files');
+ $::lxdebug->message(LXDebug::WARN(), "Mailer error during 'send': $error");
+
+ return $error;
}
# Set defaults & headers
'Message-ID' => '<' . $self->_create_message_id . '>',
'X-Mailer' => "kivitendo $self->{version}",
];
+ $self->{mail_attachments} = [];
+ $self->{content_by_name} = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;
my $error;
my $ok = eval {
my $email = $self->_create_message;
- # $::lxdebug->message(0, "message: " . $email->as_string);
+ #$::lxdebug->message(0, "message: " . $email->as_string);
# return "boom";
- $self->{driver}->start_mail(from => $self->{from}, to => [ $self->_all_recipients ]);
+ $::lxdebug->message(LXDebug->DEBUG2(), "mail1 from=".$self->{from}." to=".$self->{to});
+ my $from_obj = (Email::Address->parse($self->{from}))[0];
+
+ $self->{driver}->start_mail(from => $from_obj->address, to => [ $self->_all_recipients ]);
$self->{driver}->print($email->as_string);
$self->{driver}->send;
$error = $@ if !$ok;
- $self->_store_in_journal;
+ $self->{journalentry} = $self->_store_in_journal;
- return $ok ? '' : "send email: $error";
+ return $ok ? '' : ($error || "undefined error");
}
sub _all_recipients {
my ($self) = @_;
-
$self->{addresses} ||= {};
return map { @{ $self->{addresses}->{$_} || [] } } qw(to cc bcc);
}
sub _store_in_journal {
my ($self, $status, $extended_status) = @_;
+ my $journal_enable = $::instance_conf->get_email_journal;
+
+ return if $journal_enable == 0;
+
$status //= $self->{driver}->status if $self->{driver};
$status //= 'failed';
$extended_status //= $self->{driver}->extended_status if $self->{driver};
$extended_status //= 'unknown error';
- my @attachments = grep { $_ } map {
- my $part = $self->_create_attachment_part($_);
- if ($part) {
- SL::DB::EmailJournalAttachment->new(
- name => $part->filename,
- mime_type => $part->content_type,
- content => $part->body,
- )
- }
- } @{ $self->{attachments} || [] };
-
my $headers = join "\r\n", (bundle_by { join(': ', @_) } 2, @{ $self->{headers} || [] });
- SL::DB::EmailJournal->new(
+ my $jentry = SL::DB::EmailJournal->new(
sender => SL::DB::Manager::Employee->current,
from => $self->{from} // '',
recipients => join(', ', $self->_all_recipients),
headers => $headers,
body => $self->{message} // '',
sent_on => DateTime->now_local,
- attachments => \@attachments,
+ attachments => \@{ $self->{mail_attachments} },
status => $status,
extended_status => $extended_status,
)->save;
+ return $jentry->id;
}
1;
projects / kivitendo-erp.git / blobdiff