sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

improved contact form

Browse Source
This commit is contained in:
Sander Roosendaal
2020-01-06 22:35:58 +01:00
parent 028ddfcfe7
commit 4c1f717be5
5 changed files with 145 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/forms.py
View File

@@ -115,7 +115,6 @@ class EmailForm(forms.Form):
lastname = forms.CharField(max_length=255) lastname = forms.CharField(max_length=255)
email = forms.EmailField() email = forms.EmailField()
subject = forms.CharField(max_length=255) subject = forms.CharField(max_length=255)
botcheck = forms.CharField(max_length=5)
message = forms.CharField() message = forms.CharField()
disqualificationreasons = ( disqualificationreasons = (

219
rowers/templates/email.html
View File

@@ -3,115 +3,134 @@
{% block main %} {% block main %}
<h1>Contact us through email</h1> <h1>Contact us through email</h1>
<ul class="main-content"> <ul class="main-content">
<li class="grid_2"> <li class="grid_2">
{% if form.errors %} {% if form.errors %}
<p style="color: red;"> <p style="color: red;">
Please correct the error{{ form.errors|pluralize }} below. Please correct the error{{ form.errors|pluralize }} below.
</p> </p>
{% endif %} {% endif %}
<form method="post" action="/rowers/email/send/">{% csrf_token %} <form method="post" action="/rowers/email/send/" id="contactform">{% csrf_token %}
<table> <p>
<tr><td> <table>
<label class="label">Name <span class="required">*</span></label> <tr><td>
<span class="span"> <label>Name <span class="required">*</span></label>
</td><td> <span class="span">
<input name= "firstname" class="inputtext" maxlength="255" size="12" /> </td><td>
<label class="spanlabel">First</label> <input name= "firstname" class="inputtext" maxlength="255" size="12" />
</td></tr> <label>First</label>
<tr><td> </td></tr>
</span> <tr><td>
<span class="span"> </span>
</td><td> <span class="span">
<input name= "lastname" class="inputtext" maxlength="255" size="18" /> </td><td>
<label class="spanlabel">Last</label> <input name= "lastname" class="inputtext" maxlength="255" size="18" />
</span> <label>Last</label>
</td></tr> </span>
<tr><td> </td></tr>
<label class="label">Email Address <span class="required">*</span></label> <tr><td>
</td><td> <label>Email Address <span class="required">*</span></label>
<input name="email" class="inputtext" type="text" maxlength="255" size="35" /> </td><td>
</td></tr> <input name="email" class="inputtext" type="text" maxlength="255" size="35" />
<tr><td> </td></tr>
<label class="label">Subject <span class="required">*</span></label> <tr><td>
</td><td> <label>Subject <span class="required">*</span></label>
<input name="subject" class="inputtext" type="text" maxlength="255" size="45" /> </td><td>
</td></tr> <input name="subject" class="inputtext" type="text" maxlength="255" size="45" />
</table> </td></tr>
<label class="label">You must answer <u>YES</u> to the question below to approve sending this email. <span class="required">*</span></label> </table>
<table> <table>
<tr><td> <input type="hidden" name="g-recaptcha-response" id='recaptcha'>
Do you want to send me an email? </td></tr>
</td><td> <tr><td>
<input name="botcheck" class="inputtext" type="text" maxlength="5" size="5" /> <label>Message <span class="required">*</span></label>
</td></tr> </td><td>
<tr><td> <textarea name="message" class="inputtextarea" rows="11" cols="45"></textarea>
<label class="label">Message <span class="required">*</span></label> </td></tr>
</td><td> <tr><td>
<textarea name="message" class="inputtextarea" rows="11" cols="45"></textarea> <input type="submit" name="submitform" value="Send Message" />
</td></tr> </td></tr>
<tr><td> </table>
<input type="submit" name="submitform" value="Send Message" /> </p>
</td></tr> </form>
</table>
</form>
</li> </li>
<li class="grid_2"> <li class="grid_2">
<h1>Bug reporting, feature requests</h1> <h1>Bug reporting, feature requests</h1>
<p> <p>
Bug reports and feature requests can be done through our BitBucket page. Please check on the following link if your bug or issue is a known one. Feel free to file any feature request. Bug reports and feature requests can be done through our BitBucket page. Please check on the following link if your bug or issue is a known one. Feel free to file any feature request.
<ul> <ul>
<li><a href="https://bitbucket.org/sanderroosendaal/rowsandall/issues">BitBucket Issue list (click here to go report an issue or request a feature)</a></li> <li><a href="https://bitbucket.org/sanderroosendaal/rowsandall/issues">BitBucket Issue list (click here to go report an issue or request a feature)</a></li>
</ul> </ul>
</p> </p>
</li> </li>
<li class="grid_2"> <li class="grid_2">
<h1>Facebook Group</h1> <h1>Facebook Group</h1>
<p>We run a facebook group where you can post questions and report problems,
especially if you think the wider user community benefits from the answers.</p>
<ul>
<li><a href="https://www.facebook.com/groups/rowsandall/">https://www.facebook.com/groups/rowsandall/</a></li>
</ul>
</li>
<li class="grid_2"> <p>We run a facebook group where you can post questions and report problems,
<h1>Twitter</h1> especially if you think the wider user community benefits from the answers.</p>
<ul>
<p>You can also check me on Twitter: <li><a href="https://www.facebook.com/groups/rowsandall/">https://www.facebook.com/groups/rowsandall/</a></li>
<ul> </ul>
<li><a href="https://twitter.com/rowsandall">https://twitter.com/rowsandall</a> </li>
</ul>
When the site is down, this is the appropriate channel to look for apologies, updates, and offer help.
</p>
</li>
<li class="grid_2"> <li class="grid_2">
<h1>Rowsandall s.r.o.</h1> <h1>Twitter</h1>
<p><strong>Rowsandall s.r.o.</strong><br />
Nov&eacute; sady 988/2<br />
602 00 Brno<br />
Czech Republic<br />
IČ: 070 48 572<br />
DIČ: CZ 070 48 572 (Nejsme plátce DPH)<br />
Datová schránka: 7897syr<br />
Email: <a href="mailto:info@rowsandall.com">info@rowsandall.com</a><br />
The company is registered in the business register at the
Regional Court in Brno (Společnost je zapsána v obchodním rejstříku vedeném u Krajského soudu v Brně, oddíl C, vložka 105845)<br/>
</p>
</li> <p>You can also check me on Twitter:
</ul> <ul>
{% endblock %} <li><a href="https://twitter.com/rowsandall">https://twitter.com/rowsandall</a>
</ul>
When the site is down, this is the appropriate channel to look for apologies, updates, and offer help.
</p>
</li>
{% block sidebar %} <li class="grid_2">
{% include 'menu_help.html' %} <h1>Rowsandall s.r.o.</h1>
{% endblock %}
<p><strong>Rowsandall s.r.o.</strong><br />
Nov&eacute; sady 988/2<br />
602 00 Brno<br />
Czech Republic<br />
IČ: 070 48 572<br />
DIČ: CZ 070 48 572 (Nejsme plátce DPH)<br />
Datová schránka: 7897syr<br />
Email: <a href="mailto:info@rowsandall.com">info@rowsandall.com</a><br />
The company is registered in the business register at the
Regional Court in Brno (Společnost je zapsána v obchodním rejstříku vedeném u Krajského soudu v Brně, oddíl C, vložka 105845)<br/>
</p>
</li>
</ul>
{% endblock %}
{% block sidebar %}
{% include 'menu_help.html' %}
{% endblock %}
{% block scripts %}
<script src="https://www.google.com/recaptcha/api.js?render=6LdRtMwUAAAAAGcKcFc28pGvmEb1wwDY27i0AX8B"></script>
<script>
// 3
grecaptcha.ready(function() {
// 4
$('#contactform').submit(function(e){
var form = this;
// 5
e.preventDefault()
grecaptcha.execute('6LdRtMwUAAAAAGcKcFc28pGvmEb1wwDY27i0AX8B', {action: 'contactform'}).then(function(token) {
// 6
$('#recaptcha').val(token)
// 7
form.submit()
});
})
});
</script>
{% endblock %}

37
rowers/views/statements.py
View File

@@ -1073,28 +1073,39 @@ def add_defaultfavorites(r):
f.save() f.save()
return 1 return 1
# Shows email form and sends it if submitted # Shows email form and sends it if submitted
def sendmail(request): def sendmail(request):
if request.method == 'POST': if request.method == 'POST':
# test recaptcha
response_string = request.POST.get('g-recaptcha-response')
# replace below with settings
recaptcha_secret = '6LdRtMwUAAAAABc3piLDlI5VNDkOtEMIOckNi9tm'
url = 'https://www.google.com/recaptcha/api/siteverify'
data = {
'secret':recaptcha_secret,
'response': response_string,
}
response = requests.post(url,data=data,verify=True)
success = False
if response.status_code == 200:
success = response.json().get('success')
form = EmailForm(request.POST) form = EmailForm(request.POST)
if form.is_valid(): if form.is_valid() and success:
firstname = form.cleaned_data['firstname'] firstname = form.cleaned_data['firstname']
lastname = form.cleaned_data['lastname'] lastname = form.cleaned_data['lastname']
email = form.cleaned_data['email'] email = form.cleaned_data['email']
subject = form.cleaned_data['subject'] subject = 'Rowsandall Contact Form:'+form.cleaned_data['subject']
botcheck = form.cleaned_data['botcheck'].lower()
message = form.cleaned_data['message'] message = form.cleaned_data['message']
if botcheck == 'yes': fullemail = firstname + " " + lastname + " " + "<" + email + ">"
try: send_mail(subject, message, fullemail, ['info@rowsandall.com'])
fullemail = firstname + " " + lastname + " " + "<" + email + ">" return HttpResponseRedirect('/rowers/email/thankyou/')
send_mail(subject, message, fullemail, ['info@rowsandall.com'])
return HttpResponseRedirect('/rowers/email/thankyou/')
except:
return HttpResponseRedirect('/rowers/email/')
else:
messages.error(request,'You have to answer YES to the question')
return HttpResponseRedirect('/rowers/email/')
else: else:
if not success:
messages.error(request,'Bots are not welcome')
else:
messages.error(request,'Something went wrong. Please try again')
return HttpResponseRedirect('/rowers/email/') return HttpResponseRedirect('/rowers/email/')
else: else:
return HttpResponseRedirect('/rowers/email/') return HttpResponseRedirect('/rowers/email/')

2
rowsandall_app/settings_dev.py
View File

@@ -60,7 +60,7 @@ DEBUG = True
TEMPLATES[0]['OPTIONS']['debug'] = DEBUG TEMPLATES[0]['OPTIONS']['debug'] = DEBUG
ALLOWED_HOSTS = ['localhost'] ALLOWED_HOSTS = ['localhost','127.0.0.1']
# INSTALLED_APPS += ['debug_toolbar',] # INSTALLED_APPS += ['debug_toolbar',]

1
templates/newbase.html
View File

@@ -48,6 +48,7 @@
<link rel="stylesheet" href="/static/css/rowsandall2.min.css" /> <link rel="stylesheet" href="/static/css/rowsandall2.min.css" />
{% block meta %} {% endblock %} {% block meta %} {% endblock %}
<div id="fb-root"></div> <div id="fb-root"></div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script>(function(d, s, id) { <script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0]; var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return; if (d.getElementById(id)) return;