dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mail.send(...,sender='Mr X <%(sender)s>')

Browse Source
This commit is contained in:
mdipierro
2012-09-19 00:00:18 -05:00
parent 29edf94498
commit 8d9bc1cb53
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.9 (2012-09-18 13:39:12) stable Version 2.0.9 (2012-09-19 00:00:12) stable
gluon/tools.py
+4 -2
View File
@@ -264,6 +264,7 @@ class Mail(object):
cc=None, cc=None,
bcc=None, bcc=None,
reply_to=None, reply_to=None,
sender='%(sender)s',
encoding='utf-8', encoding='utf-8',
raw=False, raw=False,
headers={} headers={}
@@ -606,7 +607,7 @@ class Mail(object):
# no cryptography process as usual # no cryptography process as usual
payload=payload_in payload=payload_in
payload['From'] = encoded_or_raw(self.settings.sender.decode(encoding)) payload['From'] = encoded_or_raw(sender.decode(encoding))
origTo = to[:] origTo = to[:]
if to: if to:
payload['To'] = encoded_or_raw(', '.join(to).decode(encoding)) payload['To'] = encoded_or_raw(', '.join(to).decode(encoding))
@@ -623,10 +624,11 @@ class Mail(object):
for k,v in headers.iteritems(): for k,v in headers.iteritems():
payload[k] = encoded_or_raw(v.decode(encoding)) payload[k] = encoded_or_raw(v.decode(encoding))
result = {} result = {}
sender = sender % dict(sender=self.settings.sender)
try: try:
if self.settings.server == 'logging': if self.settings.server == 'logging':
logger.warn('email not sent\n%s\nFrom: %s\nTo: %s\nSubject: %s\n\n%s\n%s\n' % \ logger.warn('email not sent\n%s\nFrom: %s\nTo: %s\nSubject: %s\n\n%s\n%s\n' % \
('-'*40,self.settings.sender, ('-'*40,sender,
', '.join(to),subject, ', '.join(to),subject,
text or html,'-'*40)) text or html,'-'*40))
elif self.settings.server == 'gae': elif self.settings.server == 'gae':