Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add filename to attachment parts.

Browse source
This commit is contained in:
Martin Edenhofer 2016-05-17 11:55:12 +02:00
parent d3a428cdca
commit 327a0bd50a
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/channel/email_build.rb
View file

@ -90,7 +90,7 @@ module Channel::EmailBuild
next if attachment.preferences['Content-ID'].empty? next if attachment.preferences['Content-ID'].empty?
attachment = Mail::Part.new do attachment = Mail::Part.new do
content_type attachment.preferences['Content-Type'] content_type attachment.preferences['Content-Type']
content_id attachment.preferences['Content-ID'] content_id "<#{attachment.preferences['Content-ID']}>"
content_disposition attachment.preferences['Content-Disposition'] || 'inline' content_disposition attachment.preferences['Content-Disposition'] || 'inline'
content_transfer_encoding 'binary' content_transfer_encoding 'binary'
body attachment.content.force_encoding('BINARY') body attachment.content.force_encoding('BINARY')
@ -111,10 +111,13 @@ module Channel::EmailBuild
mail.attachments[ attachment[:filename] ] = attachment mail.attachments[ attachment[:filename] ] = attachment
else else
next if !attachment.preferences['Content-ID'].empty? next if !attachment.preferences['Content-ID'].empty?
filename = attachment.filename
encoded_filename = Mail::Encodings.decode_encode filename, :encode
disposition = attachment.preferences['Content-Disposition'] || 'attachment'
content_type = attachment.preferences['Content-Type'] || 'application/octet-stream'
mail.attachments[attachment.filename] = { mail.attachments[attachment.filename] = {
content_disposition: attachment.preferences['Content-Disposition'] || 'attachment', content_disposition: "#{disposition}; filename=\"#{encoded_filename}\"",
content_type: attachment.preferences['Content-Type'], content_type: "#{content_type}; filename=\"#{encoded_filename}\"",
mime_type: attachment.preferences['Mime-Type'],
content: attachment.content content: attachment.content
} }
end end