Möglichkeit eingebaut, den Namen des Anhangs einer verschickten Mail anzugeben.

diff --git a/SL/Form.pm b/SL/Form.pm
index 5452a3221aa860ae349b47977da3ac4c712bac45..9a992bd3a040b77a8f4b9eb6f3d6fd13e98762f3 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -839,7 +839,12 @@ sub parse_template {
 
       } else {
 
 
       } else {
 

-        @{ $mail->{attachments} } = ($self->{tmpfile}) unless ($self->{do_not_attach});
+        if (!$self->{"do_not_attach"}) {
+          @{ $mail->{attachments} } =
+            ({ "filename" => $self->{"tmpfile"},
+               "name" => $self->{"attachment_filename"} ?
+                 $self->{"attachment_filename"} : $self->{"tmpfile"} });
+        }

 
         $mail->{message}       =~ s/\r\n/\n/g;
         $myconfig->{signature} =~ s/\\n/\n/g;
 
         $mail->{message}       =~ s/\r\n/\n/g;
         $myconfig->{signature} =~ s/\\n/\n/g;

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index 453603ff1f234f0afb7555868a9e9ba025c1c43b..37d98b7a7d00bf12d705eab256f8c144bcec5082 100644 (file)
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -147,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"


@@ -159,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