Revision b161d667
Von Bernd Bleßmann vor mehr als 6 Jahren hinzugefügt
| SL/Form.pm | ||
|---|---|---|
| 1110 | 1110 |
my @attfiles; |
| 1111 | 1111 |
# if we send html or plain text inline |
| 1112 | 1112 |
if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) {
|
| 1113 |
$mail->{contenttype} = "text/html";
|
|
| 1113 |
$mail->{content_type} = "text/html";
|
|
| 1114 | 1114 |
$mail->{message} =~ s/\r//g;
|
| 1115 | 1115 |
$mail->{message} =~ s/\n/<br>\n/g;
|
| 1116 | 1116 |
$full_signature =~ s/\n/<br>\n/g; |
| SL/Mailer.pm | ||
|---|---|---|
| 209 | 209 |
if ($self->{message}) {
|
| 210 | 210 |
push @parts, Email::MIME->create( |
| 211 | 211 |
attributes => {
|
| 212 |
content_type => $self->{contenttype},
|
|
| 212 |
content_type => $self->{content_type},
|
|
| 213 | 213 |
charset => $self->{charset},
|
| 214 | 214 |
encoding => 'quoted-printable', |
| 215 | 215 |
}, |
| ... | ... | |
| 217 | 217 |
); |
| 218 | 218 |
|
| 219 | 219 |
push @{ $self->{headers} }, (
|
| 220 |
'Content-Type' => qq|$self->{contenttype}; charset="$self->{charset}"|,
|
|
| 220 |
'Content-Type' => qq|$self->{content_type}; charset="$self->{charset}"|,
|
|
| 221 | 221 |
); |
| 222 | 222 |
} |
| 223 | 223 |
|
| ... | ... | |
| 243 | 243 |
} |
| 244 | 244 |
|
| 245 | 245 |
# Set defaults & headers |
| 246 |
$self->{charset} = 'UTF-8';
|
|
| 247 |
$self->{contenttype} ||= "text/plain";
|
|
| 248 |
$self->{headers} = [
|
|
| 249 |
Subject => $self->{subject},
|
|
| 250 |
'Message-ID' => '<' . $self->_create_message_id . '>', |
|
| 251 |
'X-Mailer' => "kivitendo " . SL::Version->get_version, |
|
| 246 |
$self->{charset} = 'UTF-8';
|
|
| 247 |
$self->{content_type} ||= "text/plain";
|
|
| 248 |
$self->{headers} = [
|
|
| 249 |
Subject => $self->{subject},
|
|
| 250 |
'Message-ID' => '<' . $self->_create_message_id . '>',
|
|
| 251 |
'X-Mailer' => "kivitendo " . SL::Version->get_version,
|
|
| 252 | 252 |
]; |
| 253 | 253 |
$self->{mail_attachments} = [];
|
| 254 | 254 |
$self->{content_by_name} = $::instance_conf->get_email_journal == 1 && $::instance_conf->get_doc_files;
|
Auch abrufbar als: Unified diff
SL::Mailer: content_type statt contenttype, so wie im POD beschrieben