Merge lp:~openerp-dev/openobject-addons/7.0-inline-images-in-mail into lp:openobject-addons/7.0

[Paramjit Singh Sahota(OpenERP)]

Hello,

Fixed the issue of mail where the image is not visible on mail wall if the images coming in email as inline image.
Related branch of server: https://code.launchpad.net/~openerp-dev/openobject-server/7.0-inline-images-in-mail

Thankz You.

[lp:~openerp-dev/openobject-addons/7.0-inline-images-in-mail]

9841. By Paramjit Singh Sahota(OpenERP) on 2014-02-18

[IMP] Improved code.

Unmerged revisions

9841. By Paramjit Singh Sahota(OpenERP) on 2014-02-18

[IMP] Improved code.

9840. By Paramjit Singh Sahota(OpenERP) on 2014-02-14

[FIX] Fixed the issue of email in which the images coming inline in email are not visible.

=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py	2014-02-13 09:57:17 +0000
+++ mail/mail_thread.py	2014-02-18 08:50:43 +0000
@@ -29,6 +29,7 @@
 import time
 import xmlrpclib
 from email.message import Message
+from lxml import etree
 
 from openerp import tools
 from openerp import SUPERUSER_ID
@@ -801,6 +802,15 @@
                     else:
                         filename=decode(filename)
                 encoding = part.get_content_charset()  # None if attachment
+                # For inline attachement
+                content_type = re.split(r"\s*[,;]\s*", part.get('Content-Type').strip())
+                if part.get('content-disposition', '').strip().startswith('inline') or content_type[0] == 'image/png':
+                    content_id = str(part.get('Content-ID'))
+                    content_id = email.utils.collapse_rfc2231_value(content_id).strip()
+                    doc = etree.HTML(str(body))
+                    for node in doc.xpath("//img[@src='cid:%s']" %(content_id)):
+                        node.set('src', 'data:%s;%s,%s' %(content_type[0], part.get('Content-Transfer-Encoding'), part.get_payload()))
+                    body = etree.tostring(doc)
                 # 1) Explicit Attachments -> attachments
                 if filename or part.get('content-disposition', '').strip().startswith('attachment'):
                     attachments.append((filename or 'attachment', part.get_payload(decode=True)))