X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=87b3dfc86cc08778d3735d9ae349bed0c8559634;hb=826d79929635c726f7459296fafa7e630c00e72d;hp=eb94ae3f799dc27571894f4c4457409a4d66bcc5;hpb=1b9a64fa292f375c82b4af788d0606354bc4e8ff;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index eb94ae3f7..87b3dfc86 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -25,6 +25,7 @@ package Mailer;
 
 use Email::Address;
 use Email::MIME::Creator;
+use File::MimeInfo::Magic;
 use File::Slurp;
 use List::UtilsBy qw(bundle_by);
 
@@ -32,7 +33,6 @@ use SL::Common;
 use SL::DB::EmailJournal;
 use SL::DB::EmailJournalAttachment;
 use SL::DB::Employee;
-use SL::MIME;
 use SL::Template;
 
 use strict;
@@ -133,31 +133,56 @@ sub _create_attachment_part {
   );
 
   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 {
@@ -165,6 +190,8 @@ sub _create_message {
 
   my @parts;
 
+  push @{ $self->{headers} }, (Type => "multipart/mixed");
+
   if ($self->{message}) {
     push @parts, Email::MIME->create(
       attributes => {
@@ -183,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,
   );
 }
 
@@ -194,8 +221,11 @@ sub send {
   # 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
@@ -206,6 +236,8 @@ sub send {
     '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 {
@@ -215,10 +247,13 @@ sub send {
 
     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;
 
@@ -227,14 +262,13 @@ sub 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);
 }
@@ -251,22 +285,9 @@ sub _store_in_journal {
   $extended_status //= $self->{driver}->extended_status if $self->{driver};
   $extended_status //= 'unknown error';
 
-  my @attachments;
-
-  @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} || [] } if $journal_enable > 1;
-
   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),
@@ -274,10 +295,11 @@ sub _store_in_journal {
     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;