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

Streamline of naming for html messages/attachments.

Browse source
This commit is contained in:
Martin Edenhofer 2014-12-29 11:27:59 +01:00
parent e6ab57f97c
commit 52de425e0c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -130,7 +130,7 @@ class Channel::EmailParser
else else
filename = '-no name-' filename = '-no name-'
if mail.html_part.body if mail.html_part.body
filename = 'html-email' filename = 'message.html'
data[:body] = mail.html_part.body.to_s data[:body] = mail.html_part.body.to_s
data[:body] = Encode.conv( mail.html_part.charset.to_s, data[:body] ) data[:body] = Encode.conv( mail.html_part.charset.to_s, data[:body] )
data[:body] = html2ascii( data[:body] ).to_s.force_encoding('utf-8') data[:body] = html2ascii( data[:body] ).to_s.force_encoding('utf-8')
@ -183,7 +183,7 @@ class Channel::EmailParser
# not multipart email # not multipart email
else else
# text part # text part only
if !mail.mime_type || mail.mime_type.to_s == '' || mail.mime_type.to_s.downcase == 'text/plain' if !mail.mime_type || mail.mime_type.to_s == '' || mail.mime_type.to_s.downcase == 'text/plain'
data[:body] = mail.body.decoded data[:body] = mail.body.decoded
data[:body] = Encode.conv( mail.charset, data[:body] ) data[:body] = Encode.conv( mail.charset, data[:body] )
@ -192,11 +192,11 @@ class Channel::EmailParser
data[:body] = data[:body].encode('utf-8', 'binary', :invalid => :replace, :undef => :replace, :replace => '?') data[:body] = data[:body].encode('utf-8', 'binary', :invalid => :replace, :undef => :replace, :replace => '?')
end end
# html part # html part only, convert ot text and add it as attachment
else else
filename = '-no name-' filename = '-no name-'
if mail.mime_type.to_s.downcase == 'text/html' if mail.mime_type.to_s.downcase == 'text/html'
filename = 'html-email' filename = 'message.html'
data[:body] = mail.body.decoded data[:body] = mail.body.decoded
data[:body] = Encode.conv( mail.charset, data[:body] ) data[:body] = Encode.conv( mail.charset, data[:body] )
data[:body] = html2ascii( data[:body] ).to_s.force_encoding('utf-8') data[:body] = html2ascii( data[:body] ).to_s.force_encoding('utf-8')
@ -234,7 +234,7 @@ class Channel::EmailParser
data[:body].gsub!( /\r\n/, "\n" ) data[:body].gsub!( /\r\n/, "\n" )
data[:body].gsub!( /\r/, "\n" ) data[:body].gsub!( /\r/, "\n" )
return data data
end end
def _get_attachment( file, attachments, mail ) def _get_attachment( file, attachments, mail )