Bei print_options() die Parameterübergabe umgestellt, sodass der Aufrufer das Verhalt...

[kivitendo-erp.git] / SL / Mailer.pm

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 1a377f3..7b011d4 100644 (file)
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -30,6 +30,8 @@
 
 package Mailer;
 
+use SL::Common;
+
 sub new {
   $main::lxdebug->enter_sub();
 
@@ -55,17 +57,18 @@ sub mime_quote_text {
   for (my $i = 0; $i < length($text); $i++) {
     my $char = ord(substr($text, $i, 1));
 
-    if (($char < 33) || ($char > 127) ||
-        ($char == ord('?')) || ($char == ord(' '))) {
+    if (($char < 32) || ($char > 127) ||
+        ($char == ord('?')) || ($char == ord('_'))) {
       if ($chars_left < 5) {
         $new_text .= "?=\n $q_start";
         $chars_left = 75 - $l_start;
       }
 
-      $new_text .= sprintf("=%02x", $char);
+      $new_text .= sprintf("=%02X", $char);
       $chars_left -= 3;
 
     } else {
+      $char = ord('_') if ($char == ord(' '));
       if ($chars_left < 5) {
         $new_text .= "?=\n $q_start";
         $chars_left = 75 - $l_start;
@@ -86,7 +89,9 @@ sub mime_quote_text {
 sub send {
   $main::lxdebug->enter_sub();
 
-  my ($self, $out) = @_;
+  my ($self) = @_;
+
+  local (*IN, *OUT);
 
   my $boundary = time;
   $boundary = "LxOffice-$self->{version}-$boundary";
@@ -94,18 +99,11 @@ sub send {
   $domain =~ s/(.*?\@|>)//g;
   my $msgid = "$boundary\@$domain";
 
-  $self->{charset} = "ISO-8859-15" unless $self->{charset};
+  $self->{charset} = Common::DEFAULT_CHARSET unless $self->{charset};
 
-  if ($out) {
-    if (!open(OUT, $out)) {
-      $main::lxdebug->leave_sub();
-      return "$out : $!";
-    }
-  } else {
-    if (!open(OUT, ">-")) {
-      $main::lxdebug->leave_sub();
-      return "STDOUT : $!";
-    }
+  if (!open(OUT, $main::sendmail)) {
+    $main::lxdebug->leave_sub();
+    return "$main::sendmail : $!";
   }
 
   $self->{contenttype} = "text/plain" unless $self->{contenttype};
@@ -146,6 +144,17 @@ $self->{message}
 
     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"
@@ -158,11 +167,6 @@ $self->{message}
         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