use Email::Address;
use SL::Common;
+use SL::MIME;
use SL::Template;
+use strict;
+
my $num_sent = 0;
sub new {
$email =~ s/[^\w\.\-\+=@]//ig;
my %temp_form = ( %{ $form }, 'myconfig_email' => $email );
- my $template = PlainTextTemplate->new(undef, \%temp_form, $myconfig);
+ my $template = SL::Template::create(type => 'PlainText', form => \%temp_form);
my $sendmail = $template->parse_block($main::sendmail);
if (!open(OUT, $sendmail)) {
$filename =~ s/(.*\/|\Q$self->{fileid}\E)//g;
}
- my $application =
- ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/)
- ? "text"
- : "application";
+ my $application = ($attachment =~ /(^\w+$)|\.(html|text|txt|sql)$/) ? "text" : "application";
+ my $content_type = SL::MIME->mime_type_from_ext($filename);
+ $content_type = "${application}/$self->{format}" if (!$content_type && $self->{format});
+ $content_type ||= 'application/octet-stream';
open(IN, $attachment);
if ($?) {
return "$attachment : $!";
}
- print OUT qq|--${boundary}
-Content-Type: $application/$self->{format}; name="$filename"; |;
-
# only set charset for attachements of type text. every other type should not have this field
# refer to bug 883 for detailed information
- if ($application eq 'text' && $self->{charset}) {
- print OUT qq|charset="$self->{charset}" |;
+ my $attachment_charset;
+ if (lc $application eq 'text' && $self->{charset}) {
+ $attachment_charset = qq|; charset="$self->{charset}" |;
}
- print OUT qq|
+ print OUT qq|--${boundary}
+Content-Type: ${content_type}; name="$filename"$attachment_charset
Content-Transfer-Encoding: BASE64
Content-Disposition: attachment; filename="$filename"\n\n|;