use Email::Address;
use SL::Common;
+use SL::MIME;
use SL::Template;
+use strict;
+
my $num_sent = 0;
sub new {
$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 : $!";
}
+ # only set charset for attachements of type text. every other type should not have this field
+ # refer to bug 883 for detailed information
+ my $attachment_charset;
+ if (lc $application eq 'text' && $self->{charset}) {
+ $attachment_charset = qq|; charset="$self->{charset}" |;
+ }
+
print OUT qq|--${boundary}
-Content-Type: $application/$self->{format}; name="$filename"; charset="$self->{charset}"
+Content-Type: ${content_type}; name="$filename"$attachment_charset
Content-Transfer-Encoding: BASE64
Content-Disposition: attachment; filename="$filename"\n\n|;