Merge lp:~gdukai/poweremail/outgoing_header_details into lp:poweremail/trunk

Proposed by Dukai Gábor
Status: Merged
Merged at revision: not available
Proposed branch: lp:~gdukai/poweremail/outgoing_header_details
Merge into: lp:poweremail/trunk
Diff against target: 25 lines (+6/-2)
1 file modified
poweremail_core.py (+6/-2)
To merge this branch: bzr merge lp:~gdukai/poweremail/outgoing_header_details
Reviewer Review Type Date Requested Status
Sharoon Thomas http://openlabs.co.in Approve
Review via email: mp+22720@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sharoon Thomas http://openlabs.co.in (sharoonthomas) wrote :

I approve the merge.

Thanks for the enhancement

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'poweremail_core.py'
2--- poweremail_core.py 2010-03-25 23:33:32 +0000
3+++ poweremail_core.py 2010-04-02 18:35:22 +0000
4@@ -32,7 +32,8 @@
5 from email.mime.base import MIMEBase
6 from email.mime.multipart import MIMEMultipart
7 from email.mime.text import MIMEText
8-from email.header import decode_header
9+from email.header import decode_header, Header
10+from email.utils import formatdate
11 import re
12 import netsvc
13 import poplib
14@@ -431,7 +432,10 @@
15 msg = MIMEMultipart()
16 if subject:
17 msg['Subject'] = subject
18- msg['From'] = tools.ustr(core_obj.name + "<" + core_obj.email_id + ">")
19+ sender_name = Header(core_obj.name, 'utf-8').encode()
20+ msg['From'] = sender_name + " <" + core_obj.email_id + ">"
21+ msg['Organization'] = tools.ustr(core_obj.user.company_id.name)
22+ msg['Date'] = formatdate()
23 addresses_l = self.get_ids_from_dict(addresses)
24 if addresses_l['To']:
25 msg['To'] = u','.join(addresses_l['To'])