Zwei neue Features:

[mfinanz.git] / SL / Mailer.pm

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 76eac68e344d981db97c0d56de816445e9f50acd..234b6a784b77e30cbd048ebf301e4b0ba2ce4f7f 100644 (file)
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -30,6 +30,11 @@
 
 package Mailer;
 
 
 package Mailer;
 

+use SL::Common;
+use SL::Template;
+
+my $num_sent = 0;
+

 sub new {
   $main::lxdebug->enter_sub();
 
 sub new {
   $main::lxdebug->enter_sub();
 


@@ -41,31 +46,81 @@ sub new {
   bless $self, $type;
 }
 
   bless $self, $type;
 }
 

-sub send {
+sub mime_quote_text {

   $main::lxdebug->enter_sub();
 
   $main::lxdebug->enter_sub();
 

-  my ($self, $out) = @_;
+  my ($self, $text, $chars_left) = @_;

 
 

-  my $boundary = time;
-  $boundary = "SL-$self->{version}-$boundary";
-  my $domain = $self->{from};
-  $domain =~ s/(.*?\@|>)//g;
-  my $msgid = "$boundary\@$domain";
+  my $q_start = "=?$self->{charset}?Q?";
+  my $l_start = length($q_start);

 
 

-  $self->{charset} = "ISO-8859-1" unless $self->{charset};
+  my $new_text = "$q_start";
+  $chars_left -= $l_start;

 
 

-  if ($out) {
-    if (!open(OUT, $out)) {
-      $main::lxdebug->leave_sub();
-      return "$out : $!";
-    }
-  } else {
-    if (!open(OUT, ">-")) {
-      $main::lxdebug->leave_sub();
-      return "STDOUT : $!";
+  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) = @_;
+
+  local (*IN, *OUT);
+
+  $num_sent++;
+  my $boundary = time() . "-$$-${num_sent}";
+  $boundary    =  "LxOffice-$self->{version}-$boundary";
+  my $domain   =  $self->{from};
+  $domain      =~ s/(.*?\@|>)//g;
+  my $msgid    =  "$boundary\@$domain";
+
+  my $form     =  $main::form;
+  my $myconfig =  \%main::myconfig;
+
+  my $email    =  $myconfig->{email};
+  $email       =~ s/[^\w\.\-\+=@]//ig;
+
+  $form->{myconfig_email} = $email;
+
+  my $template =  PlainTextTemplate->new(undef, $form, $myconfig);
+  my $sendmail =  $template->parse_block($main::sendmail);
+
+  $self->{charset} = Common::DEFAULT_CHARSET unless $self->{charset};
+
+  if (!open(OUT, $sendmail)) {
+    $main::lxdebug->leave_sub();
+    return "$sendmail : $!";
+  }
+

   $self->{contenttype} = "text/plain" unless $self->{contenttype};
 
   my ($cc, $bcc);
   $self->{contenttype} = "text/plain" unless $self->{contenttype};
 
   my ($cc, $bcc);


@@ -79,11 +134,13 @@ sub send {
     $self->{$item} =~ s/\$>\$/>/g;
   }
 
     $self->{$item} =~ s/\$>\$/>/g;
   }
 

+  my $subject = $self->mime_quote_text($self->{subject}, 60);
+

   print OUT qq|From: $self->{from}
 To: $self->{to}
   print OUT qq|From: $self->{from}
 To: $self->{to}

-${cc}${bcc}Subject: $self->{subject}
+${cc}${bcc}Subject: $subject

 Message-ID: <$msgid>
 Message-ID: <$msgid>

-X-Mailer: SQL-Ledger $self->{version}
+X-Mailer: Lx-Office $self->{version}

 MIME-Version: 1.0
 |;
 
 MIME-Version: 1.0
 |;
 


@@ -102,6 +159,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/(.*\/|\Q$self->{fileid}\E)//g;
+      }
+

       my $application =
         ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/)
         ? "text"
       my $application =
         ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/)
         ? "text"


@@ -114,11 +182,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