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

Fixed adding of html attachment.

Browse source
This commit is contained in:
Martin Edenhofer 2012-06-15 13:27:52 +02:00
parent 19488186f3
commit e77034c177
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/channel/email_parser.rb
View file

@ -41,12 +41,14 @@ class Channel::EmailParser
# html_part = message.html_part ? message.html_part.body.decoded : nil # html_part = message.html_part ? message.html_part.body.decoded : nil
data[:attachments] = [] data[:attachments] = []
if mail.multipart? if mail.multipart?
# text attachment
if mail.text_part if mail.text_part
data[:plain_part] = mail.text_part.body.decoded data[:plain_part] = mail.text_part.body.decoded
data[:plain_part] = conv( mail.text_part.charset, data[:plain_part] ) data[:plain_part] = conv( mail.text_part.charset, data[:plain_part] )
# html attachment
else else
# html part
filename = '-no name-' filename = '-no name-'
if mail.html_part.body if mail.html_part.body
filename = 'html-email' filename = 'html-email'
@ -68,7 +70,7 @@ class Channel::EmailParser
headers_store['Charset'] = mail.html_part.charset headers_store['Charset'] = mail.html_part.charset
end end
attachment = { attachment = {
:data => mail.html_part.body, :data => mail.html_part.body.to_s,
:filename => mail.html_part.filename || filename, :filename => mail.html_part.filename || filename,
:preferences => headers_store :preferences => headers_store
} }