improved contact form

rowers/forms.py

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

rowers/templates/email.html

@@ -3,6 +3,7 @@
 {% block main %}
 <h1>Contact us through email</h1>
 
+
 <ul class="main-content">
 	<li class="grid_2">
 		{% if form.errors %}
@@ -12,43 +13,40 @@
 		{% endif %}
 
 
-    <form method="post" action="/rowers/email/send/">{% csrf_token %}
+		<form method="post" action="/rowers/email/send/" id="contactform">{% csrf_token %}
+			<p>
 				<table>
 					<tr><td>
-            <label class="label">Name  <span class="required">*</span></label>
+						<label>Name  <span class="required">*</span></label>
 						<span class="span">
 						</td><td>
 							<input name= "firstname" class="inputtext" maxlength="255" size="12" />
-            <label class="spanlabel">First</label>
+							<label>First</label>
 						</td></tr>
 						<tr><td>
 						</span>
 						<span class="span">
 						</td><td>
 							<input name= "lastname" class="inputtext" maxlength="255" size="18" />
-  <label class="spanlabel">Last</label>
+							<label>Last</label>
 						</span>
 					</td></tr>
 					<tr><td>
-    <label class="label">Email Address  <span class="required">*</span></label>
+						<label>Email Address  <span class="required">*</span></label>
 					</td><td>
 						<input name="email" class="inputtext" type="text" maxlength="255" size="35" />
 					</td></tr>
 					<tr><td>
-    <label class="label">Subject  <span class="required">*</span></label>
+						<label>Subject  <span class="required">*</span></label>
 					</td><td>
 						<input name="subject" class="inputtext" type="text" maxlength="255" size="45" />
 					</td></tr>
 				</table>
-<label class="label">You must answer <u>YES</u> to the question below to approve sending this email.  <span class="required">*</span></label>
 				<table>
-  <tr><td>
+					<input type="hidden" name="g-recaptcha-response" id='recaptcha'>
-      Do you want to send me an email? 
-    </td><td>
-      <input name="botcheck" class="inputtext" type="text" maxlength="5" size="5" />
 				</td></tr>
 				<tr><td>
-      <label class="label">Message  <span class="required">*</span></label>
+					<label>Message  <span class="required">*</span></label>
 				</td><td>
 					<textarea name="message" class="inputtextarea" rows="11" cols="45"></textarea>
 				</td></tr>
@@ -56,6 +54,7 @@
 					<input type="submit" name="submitform" value="Send Message" />
 				</td></tr>
 			</table>
+		</p>
 	</form>
 </li>
 
@@ -114,4 +113,24 @@
 	{% 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 %}

rowers/views/statements.py

@@ -1073,28 +1073,39 @@ def add_defaultfavorites(r):
         f.save()
     return 1
 
+
 # Shows email form and sends it if submitted
 def sendmail(request):
     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)
-        if form.is_valid():
+        if form.is_valid() and success:
             firstname = form.cleaned_data['firstname']
             lastname = form.cleaned_data['lastname']
             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']
-            if botcheck == 'yes':
-                try:
             fullemail = firstname + " " + lastname + " " + "<" + email + ">"
             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')
+            if not success:
-                return HttpResponseRedirect('/rowers/email/')
+                messages.error(request,'Bots are not welcome')
             else:
+                messages.error(request,'Something went wrong. Please try again')
             return HttpResponseRedirect('/rowers/email/')
     else:
         return HttpResponseRedirect('/rowers/email/')

rowsandall_app/settings_dev.py

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

templates/newbase.html

@@ -48,6 +48,7 @@
     <link rel="stylesheet" href="/static/css/rowsandall2.min.css" />
     {% block meta %} {% endblock %}
     <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) {
       var js, fjs = d.getElementsByTagName(s)[0];
       if (d.getElementById(id)) return;