[Erp5-report] r26404 - /erp5/trunk/products/CMFActivity/ActivityTool.py

[nobody at svn.erp5.org]

Author: rafael
Date: Tue Apr 14 04:30:59 2009
New Revision: 26404

URL: http://svn.erp5.org?rev=26404&view=rev
Log:
Use email_from_name when send the email.


Modified:
    erp5/trunk/products/CMFActivity/ActivityTool.py

Modified: erp5/trunk/products/CMFActivity/ActivityTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActivityTool.py?rev=26404&r1=26403&r2=26404&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActivityTool.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/ActivityTool.py [utf8] Tue Apr 14 04:30:59 2009
@@ -317,11 +317,13 @@
     user_email = portal.getProperty('email_to_address',
                        portal.getProperty('email_from_address'))
 
+    email_from_name = portal.getProperty('email_from_name',
+                       portal.getProperty('email_from_address'))
     call_traceback = ''
     if self.call_traceback:
       call_traceback = 'Created at:\n%s' % self.call_traceback
 
-    mail_text = """From: %s
+    mail_text = """From: %s <%s>
 To: %s
 Subject: %s
 
@@ -338,7 +340,8 @@
 Exception: %s %s
 
 %s
-""" % (activity_tool.email_from_address, user_email, message, message,
+""" % (email_from_name, activity_tool.email_from_address, 
+       user_email, message, message,
        activity_tool.getCurrentNode(), self.user_name,
        '/'.join(self.object_path), self.method_id, self.args, self.kw,
        call_traceback, self.exc_type, self.exc_value, self.traceback)