|
a/Allura/allura/tasks/mail_tasks.py |
|
b/Allura/allura/tasks/mail_tasks.py |
|
... |
|
... |
| 66 |
in_reply_to=None):
|
66 |
in_reply_to=None):
|
| 67 |
from allura import model as M
|
67 |
from allura import model as M
|
| 68 |
addrs_plain = []
|
68 |
addrs_plain = []
|
| 69 |
addrs_html = []
|
69 |
addrs_html = []
|
| 70 |
addrs_multi = []
|
70 |
addrs_multi = []
|
|
|
71 |
if fromaddr is None:
|
|
|
72 |
fromaddr = 'noreply@in.sf.net'
|
| 71 |
if '@' not in fromaddr:
|
73 |
elif '@' not in fromaddr:
|
|
|
74 |
log.warning('Looking up user with fromaddr %s', fromaddr)
|
| 72 |
user = M.User.query.get(_id=ObjectId(fromaddr))
|
75 |
user = M.User.query.get(_id=ObjectId(fromaddr))
|
| 73 |
if not user:
|
76 |
if not user:
|
| 74 |
log.warning('Cannot find user with ID %s', fromaddr)
|
77 |
log.warning('Cannot find user with ID %s', fromaddr)
|
| 75 |
fromaddr = 'noreply@in.sf.net'
|
78 |
fromaddr = 'noreply@in.sf.net'
|
| 76 |
else:
|
79 |
else:
|
|
... |
|
... |
| 125 |
reply_to,
|
128 |
reply_to,
|
| 126 |
subject,
|
129 |
subject,
|
| 127 |
message_id,
|
130 |
message_id,
|
| 128 |
in_reply_to=None):
|
131 |
in_reply_to=None):
|
| 129 |
from allura import model as M
|
132 |
from allura import model as M
|
|
|
133 |
if fromaddr is None:
|
|
|
134 |
fromaddr = 'noreply@in.sf.net'
|
| 130 |
if '@' not in fromaddr:
|
135 |
elif '@' not in fromaddr:
|
|
|
136 |
log.warning('Looking up user with fromaddr %s', fromaddr)
|
| 131 |
user = M.User.query.get(_id=ObjectId(fromaddr))
|
137 |
user = M.User.query.get(_id=ObjectId(fromaddr))
|
| 132 |
if not user:
|
138 |
if not user:
|
| 133 |
log.warning('Cannot find user with ID %s', fromaddr)
|
139 |
log.warning('Cannot find user with ID %s', fromaddr)
|
| 134 |
fromaddr = 'noreply@in.sf.net'
|
140 |
fromaddr = 'noreply@in.sf.net'
|
| 135 |
else:
|
141 |
else:
|