X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMailer.pm;h=7b011d4b0ddb1076454bf36bb949ee57b3a6df95;hb=f290077f927edc6d01d31ab3645779f21687fb04;hp=f680cc2fa1c691b5748f7d4512c5dddbfb9786a7;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index f680cc2fa..7b011d4b0 100644
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -12,7 +12,7 @@
 #   Email: dsimader@sql-ledger.org
 #     Web: http://www.sql-ledger.org
 #
-# Contributors: 
+# Contributors:
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@
 
 package Mailer;
 
+use SL::Common;
+
 sub new {
   $main::lxdebug->enter_sub();
 
@@ -41,36 +43,73 @@ sub new {
   bless $self, $type;
 }
 
+sub mime_quote_text {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $text, $chars_left) = @_;
+
+  my $q_start = "=?$self->{charset}?Q?";
+  my $l_start = length($q_start);
+
+  my $new_text = "$q_start";
+  $chars_left -= $l_start;
+
+  for (my $i = 0; $i < length($text); $i++) {
+    my $char = ord(substr($text, $i, 1));
+
+    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);
+      $chars_left -= 3;
+
+    } else {
+      $char = ord('_') if ($char == ord(' '));
+      if ($chars_left < 5) {
+        $new_text .= "?=\n $q_start";
+        $chars_left = 75 - $l_start;
+      }
+
+      $new_text .= chr($char);
+      $chars_left--;
+    }
+  }
+
+  $new_text .= "?=";
+
+  $main::lxdebug->leave_sub();
+
+  return $new_text;
+}
 
 sub send {
   $main::lxdebug->enter_sub();
 
-  my ($self, $out) = @_;
+  my ($self) = @_;
+
+  local (*IN, *OUT);
 
   my $boundary = time;
-  $boundary = "SL-$self->{version}-$boundary";
+  $boundary = "LxOffice-$self->{version}-$boundary";
   my $domain = $self->{from};
   $domain =~ s/(.*?\@|>)//g;
   my $msgid = "$boundary\@$domain";
-  
-  $self->{charset} = "ISO-8859-1" 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 : $!";
-    }
+
+  $self->{charset} = Common::DEFAULT_CHARSET unless $self->{charset};
+
+  if (!open(OUT, $main::sendmail)) {
+    $main::lxdebug->leave_sub();
+    return "$main::sendmail : $!";
   }
 
   $self->{contenttype} = "text/plain" unless $self->{contenttype};
-  
+
   my ($cc, $bcc);
-  $cc = "Cc: $self->{cc}\n" if $self->{cc};
+  $cc  = "Cc: $self->{cc}\n"   if $self->{cc};
   $bcc = "Bcc: $self->{bcc}\n" if $self->{bcc};
 
   foreach my $item (qw(to cc bcc)) {
@@ -80,15 +119,16 @@ sub send {
     $self->{$item} =~ s/\$>\$/>/g;
   }
 
+  my $subject = $self->mime_quote_text($self->{subject}, 60);
+
   print OUT qq|From: $self->{from}
 To: $self->{to}
-${cc}${bcc}Subject: $self->{subject}
+${cc}${bcc}Subject: $subject
 Message-ID: <$msgid>
-X-Mailer: SQL-Ledger $self->{version}
+X-Mailer: Lx-Office $self->{version}
 MIME-Version: 1.0
 |;
 
-
   if ($self->{attachments}) {
     print OUT qq|Content-Type: multipart/mixed; boundary="$boundary"
 
@@ -103,33 +143,44 @@ $self->{message}
     }
 
     foreach my $attachment (@{ $self->{attachments} }) {
-      
-      my $application = ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/) ? "text" : "application";
-      
+
+      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"
+        : "application";
+
       open(IN, $attachment);
       if ($?) {
-	close(OUT);
-	$main::lxdebug->leave_sub();
-	return "$attachment : $!";
+        close(OUT);
+        $main::lxdebug->leave_sub();
+        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
 Content-Disposition: attachment; filename="$filename"\n\n|;
 
       my $msg = "";
-      while (<IN>) {;
+      while (<IN>) {
+        ;
         $msg .= $_;
       }
       print OUT &encode_base64($msg);
 
       close(IN);
-      
+
     }
     print OUT qq|--${boundary}--\n|;
 
@@ -147,25 +198,24 @@ $self->{message}
   return "";
 }
 
-
 sub encode_base64 ($;$) {
   $main::lxdebug->enter_sub();
 
-
   # this code is from the MIME-Base64-2.12 package
   # Copyright 1995-1999,2001 Gisle Aas <gisle@ActiveState.com>
 
   my $res = "";
   my $eol = $_[1];
   $eol = "\n" unless defined $eol;
-  pos($_[0]) = 0;                          # ensure start at the beginning
+  pos($_[0]) = 0;    # ensure start at the beginning
 
-  $res = join '', map( pack('u',$_)=~ /^.(\S*)/, ($_[0]=~/(.{1,45})/gs));
+  $res = join '', map(pack('u', $_) =~ /^.(\S*)/, ($_[0] =~ /(.{1,45})/gs));
 
-  $res =~ tr|` -_|AA-Za-z0-9+/|;               # `# help emacs
-  # fix padding at the end
+  $res =~ tr|` -_|AA-Za-z0-9+/|;    # `# help emacs
+                                    # fix padding at the end
   my $padding = (3 - length($_[0]) % 3) % 3;
   $res =~ s/.{$padding}$/'=' x $padding/e if $padding;
+
   # break encoded string into lines of no more than 60 characters each
   if (length $eol) {
     $res =~ s/(.{1,60})/$1$eol/g;
@@ -176,6 +226,5 @@ sub encode_base64 ($;$) {
   return $res;
 }
 
-
 1;