SL::Mailer: content_type statt contenttype, so wie im POD beschrieben

diff --git a/SL/Form.pm b/SL/Form.pm
index b9835881d49d92290860f64bf563ee69dd030a37..0ecb2219d195ccf864461144bd888b9e564daaf1 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1110,7 +1110,7 @@ sub send_email {
   my @attfiles;
   # if we send html or plain text inline
   if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) {
   my @attfiles;
   # if we send html or plain text inline
   if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) {

-    $mail->{contenttype}    =  "text/html";
+    $mail->{content_type}   =  "text/html";

     $mail->{message}        =~ s/\r//g;
     $mail->{message}        =~ s/\n/<br>\n/g;
     $full_signature         =~ s/\n/<br>\n/g;
     $mail->{message}        =~ s/\r//g;
     $mail->{message}        =~ s/\n/<br>\n/g;
     $full_signature         =~ s/\n/<br>\n/g;

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 67f46fe21a483fd584b10072361b81d876553c61..5b793d43a7ab0471d729fad043d260746c1ee0f5 100644 (file)
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -209,7 +209,7 @@ sub _create_message {
   if ($self->{message}) {
     push @parts, Email::MIME->create(
       attributes => {
   if ($self->{message}) {
     push @parts, Email::MIME->create(
       attributes => {

-        content_type => $self->{contenttype},
+        content_type => $self->{content_type},

         charset      => $self->{charset},
         encoding     => 'quoted-printable',
       },
         charset      => $self->{charset},
         encoding     => 'quoted-printable',
       },


@@ -217,7 +217,7 @@ sub _create_message {
     );
 
     push @{ $self->{headers} }, (
     );
 
     push @{ $self->{headers} }, (

-      'Content-Type' => qq|$self->{contenttype}; charset="$self->{charset}"|,
+      'Content-Type' => qq|$self->{content_type}; charset="$self->{charset}"|,

     );
   }
 
     );
   }
 


@@ -243,12 +243,12 @@ sub send {
   }
 
   # Set defaults & headers
   }
 
   # Set defaults & headers

-  $self->{charset}       =  'UTF-8';
-  $self->{contenttype} ||=  "text/plain";
-  $self->{headers}       =  [
-    Subject              => $self->{subject},
-    'Message-ID'         => '<' . $self->_create_message_id . '>',
-    'X-Mailer'           => "kivitendo " . SL::Version->get_version,
+  $self->{charset}        =  'UTF-8';
+  $self->{content_type} ||=  "text/plain";
+  $self->{headers}        =  [
+    Subject               => $self->{subject},
+    'Message-ID'          => '<' . $self->_create_message_id . '>',
+    'X-Mailer'            => "kivitendo " . SL::Version->get_version,

   ];
   $self->{mail_attachments} = [];
   $self->{content_by_name}  = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;
   ];
   $self->{mail_attachments} = [];
   $self->{content_by_name}  = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;