X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=87b3dfc86cc08778d3735d9ae349bed0c8559634;hb=cc978962a88cd9f1cf15ac9d4a28db76432f8542;hp=f5b3b7764e7ecfbadb0df349f0d1a9272e8fa73c;hpb=bdb8497457cb27e2f63af411f07243815157c657;p=kivitendo-erp.git diff --git a/SL/Mailer.pm b/SL/Mailer.pm index f5b3b7764..87b3dfc86 100644 --- a/SL/Mailer.pm +++ b/SL/Mailer.pm @@ -17,23 +17,33 @@ # 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::Common; -use SL::MIME; +use SL::DB::EmailJournal; +use SL::DB::EmailJournalAttachment; +use SL::DB::Employee; 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 }; @@ -50,7 +60,7 @@ sub _create_driver { 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); @@ -117,38 +127,62 @@ sub _create_address_headers { sub _create_attachment_part { my ($self, $attachment) = @_; - my $source_file_name; - my %attributes = ( disposition => 'attachment', encoding => 'base64', ); + 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}; - $source_file_name = $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; - $source_file_name = $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) }; } - my $attachment_content = eval { read_file($source_file_name) }; - 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 { @@ -156,6 +190,8 @@ sub _create_message { my @parts; + push @{ $self->{headers} }, (Type => "multipart/mixed"); + if ($self->{message}) { push @parts, Email::MIME->create( attributes => { @@ -174,8 +210,8 @@ sub _create_message { 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, ); } @@ -185,33 +221,85 @@ sub send { # Create driver for delivery method (sendmail/SMTP) $self->{driver} = eval { $self->_create_driver }; if (!$self->{driver}) { - $::lxdebug->leave_sub(); - 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 - $self->{charset} ||= Common::DEFAULT_CHARSET; + $self->{charset} = 'UTF-8'; $self->{contenttype} ||= "text/plain"; $self->{headers} = [ Subject => $self->{subject}, '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 { + # Clean up To/Cc/Bcc address fields + $self->_cleanup_addresses; + $self->_create_address_headers; + + my $email = $self->_create_message; + + #$::lxdebug->message(0, "message: " . $email->as_string); + # return "boom"; + + $::lxdebug->message(LXDebug->DEBUG2(), "mail1 from=".$self->{from}." to=".$self->{to}); + my $from_obj = (Email::Address->parse($self->{from}))[0]; - # Clean up To/Cc/Bcc address fields - $self->_cleanup_addresses; - $self->_create_address_headers; + $self->{driver}->start_mail(from => $from_obj->address, to => [ $self->_all_recipients ]); + $self->{driver}->print($email->as_string); + $self->{driver}->send; - my $email = $self->_create_message; + 1; + }; - # $::lxdebug->message(0, "message: " . $email->as_string); - # return "boom"; + $error = $@ if !$ok; - $self->{driver}->start_mail(from => $self->{from}, to => [ map { @{ $self->{addresses}->{$_} } } qw(to cc bcc) ]); - $self->{driver}->print($email->as_string); - $self->{driver}->send; + $self->{journalentry} = $self->_store_in_journal; + + return $ok ? '' : ($error || "undefined error"); +} + +sub _all_recipients { + my ($self) = @_; + $self->{addresses} ||= {}; + return map { @{ $self->{addresses}->{$_} || [] } } qw(to cc bcc); +} - return ''; +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 $headers = join "\r\n", (bundle_by { join(': ', @_) } 2, @{ $self->{headers} || [] }); + + my $jentry = SL::DB::EmailJournal->new( + sender => SL::DB::Manager::Employee->current, + from => $self->{from} // '', + recipients => join(', ', $self->_all_recipients), + subject => $self->{subject} // '', + headers => $headers, + body => $self->{message} // '', + sent_on => DateTime->now_local, + attachments => \@{ $self->{mail_attachments} }, + status => $status, + extended_status => $extended_status, + )->save; + return $jentry->id; } 1;