projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 614.
[kivitendo-erp.git]
/
SL
/
Mailer.pm
diff --git
a/SL/Mailer.pm
b/SL/Mailer.pm
index
1a377f3
..
37d98b7
100644
(file)
--- a/
SL/Mailer.pm
+++ b/
SL/Mailer.pm
@@
-55,17
+55,18
@@
sub mime_quote_text {
for (my $i = 0; $i < length($text); $i++) {
my $char = ord(substr($text, $i, 1));
for (my $i = 0; $i < length($text); $i++) {
my $char = ord(substr($text, $i, 1));
- if (($char < 3
3
) || ($char > 127) ||
- ($char == ord('?')) || ($char == ord('
'))) {
+ if (($char < 3
2
) || ($char > 127) ||
+ ($char == ord('?')) || ($char == ord('
_
'))) {
if ($chars_left < 5) {
$new_text .= "?=\n $q_start";
$chars_left = 75 - $l_start;
}
if ($chars_left < 5) {
$new_text .= "?=\n $q_start";
$chars_left = 75 - $l_start;
}
- $new_text .= sprintf("=%02
x
", $char);
+ $new_text .= sprintf("=%02
X
", $char);
$chars_left -= 3;
} else {
$chars_left -= 3;
} else {
+ $char = ord('_') if ($char == ord(' '));
if ($chars_left < 5) {
$new_text .= "?=\n $q_start";
$chars_left = 75 - $l_start;
if ($chars_left < 5) {
$new_text .= "?=\n $q_start";
$chars_left = 75 - $l_start;
@@
-146,6
+147,17
@@
$self->{message}
foreach my $attachment (@{ $self->{attachments} }) {
foreach my $attachment (@{ $self->{attachments} }) {
+ my $filename;
+
+ if (ref($attachment) eq "HASH") {
+ $filename = $attachment->{"name"};
+ $attachment = $attachment->{"filename"};
+ } else {
+ $filename = $attachment;
+ # strip path
+ $filename =~ s/(.*\/|$self->{fileid})//g;
+ }
+
my $application =
($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/)
? "text"
my $application =
($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/)
? "text"
@@
-158,11
+170,6
@@
$self->{message}
return "$attachment : $!";
}
return "$attachment : $!";
}
- my $filename = $attachment;
-
- # strip path
- $filename =~ s/(.*\/|$self->{fileid})//g;
-
print OUT qq|--${boundary}
Content-Type: $application/$self->{format}; name="$filename"; charset="$self->{charset}"
Content-Transfer-Encoding: BASE64
print OUT qq|--${boundary}
Content-Type: $application/$self->{format}; name="$filename"; charset="$self->{charset}"
Content-Transfer-Encoding: BASE64