selfhosted
/
formspree
mirror of https://github.com/formspree/formspree.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixing email template model

This commit is contained in:
Cole 2018-09-19 23:11:30 -04:00
parent c58b2348ad
commit 55ad1569a4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
formspree/forms/models.py
View File

@ -193,7 +193,7 @@ class Form(DB.Model):
next = next_url(referrer, data.get('_next'))
spam = data.get('_gotcha', None)
format = data.get('_format', None)
fromname = None
from_name = None
# turn cc emails into array
if cc:
@ -297,7 +297,7 @@ class Form(DB.Model):
html, subject = self.template.render_body_and_subject(
data=data, host=self.host, keys=keys, now=now,
unconfirm_url=unconfirm)
fromname = self.template.from_name
from_name = self.template.from_name
elif format == 'plain':
html = render_template('email/plain_form.html',
data=data, host=self.host, keys=keys, now=now,
@ -331,7 +331,7 @@ class Form(DB.Model):
text=text,
html=html,
sender=settings.DEFAULT_SENDER,
fromname=fromname,
from_name=from_name,
reply_to=reply_to,
cc=cc,
headers={

10
formspree/utils.py
View File

@ -119,7 +119,7 @@ def next_url(referrer=None, next=None):
def send_email(to=None, subject=None, text=None, html=None,
sender=None, cc=None, reply_to=None, headers=None,
fromname=None):
from_name=None):
g.log = g.log.new(to=to, sender=sender)
if None in [to, subject, text, sender]:
@ -132,19 +132,19 @@ def send_email(to=None, subject=None, text=None, html=None,
'text': text,
'html': html}
# parse 'fromname' from 'sender' if it is
# parse 'from_name' from 'sender' if it is
# formatted like "Name <name@email.com>"
try:
bracket = sender.index('<')
data.update({
'from': sender[bracket+1:-1],
'fromname': sender[:bracket].strip()
'from_name': sender[:bracket].strip()
})
except ValueError:
data.update({'from': sender})
if fromname:
data.update({'fromname': fromname})
if from_name:
data.update({'from_name': from_name})
if headers:
data.update({'headers': json.dumps(headers)})