From 4b891f5829bdeac47aa940e8291a15e86968d214 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Wed, 21 Oct 2020 18:43:34 +0200
Subject: [PATCH] =?UTF-8?q?Captcha=20hinzugef=C3=BCgt=20und=20gecheckt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/settings.cpython-38.pyc       | Bin 4709 -> 4722 bytes
 .../__pycache__/urls.cpython-38.pyc           | Bin 2945 -> 2983 bytes
 digitaleagentur/settings.py                   |   1 +
 digitaleagentur/urls.py                       |   1 +
 requirements.txt                              |   3 +-
 users/templates/users/register.html           |  27 ++++++++++--------
 users/usersforms.py                           |  12 +++++++-
 7 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index 1dbeb6cc87259f7910f8f8120c5d326798a700fd..4c2488436f5c3f171c1b2c58b5b5913a74d3c9ea 100644
GIT binary patch
delta 372
zcmYk0xlRIM6ou!X%z$GggbGDmK@q_fa9?m=aRE`hE(o0Q7b+9&ENCq?SWdw_1EsaK
z`T$nO7w`d$KNAb@&H0jZa&vRO{NMgi+Tm!F#N6c{vQHjK`mCG(;}a$>bo2HYdM+cv
zedI<IF^pjx6PUylrZK}cYQ`+JV2(?0VjgiUU=d4PDKab@3TNcO3RXG8njupw*2#+v
zY+_4q<4oLa8*-6RI}+FtE`eQ(dlvVLj4RZEB+5yF`ZA;p8+GD<x{#)B9Fh-C@(cCg
zh<cHs0FJ2-L_wTTzs^c()n+lIH<-+1ICV=Dwvquoj5AZFL7dajU!ox^l3`rXNIexl
zN0Fn57kM~E&nOB2bX;1kV~|r)kk@|LyQ-1Bkh{JuT;*!7_Ir&rRWh!U%H$6vP<e4x
Fe*q}>XgL4?

delta 357
zcmYk0xlRIM6ovnP98gHegbKxdL=?dla9?mo#RU<U>w?M|{|v1UKxeQtv{Nvzpr!9%
zqNRn6@dd0c{FzvIZ_byTlbf6K9r_AI^FE)K$@#gj6z+nIeb&wY(WOaA-M&0TpUXn0
z0OCj>iE&I|5>uGQjPOu1W~l{pf<ePP7LdXsmV|0@EL*DJ6vPTv1;?7DP%GA{4QXs(
z(`Xl5-fUTl$*BVwY)hBHj>BDtdnOkubs{UbTt^lh`<9!!kfUxKkd8d{K%<aUFAgb;
zBkIF3_2YyhAQ~`u$yIYZj2cZgw>eG&jABkQXvA=4D>Q_28vaW>xRA*R3N%_z<<Bu(
sQXE%7XtHMl*C+xooYqMwITpEjR9;<A?~N4?_g0JkQp1NDuD<zezq>_a(EtDd

diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc
index 94df5d00f4aa8aee6840ec98b022b0730549174d..eab38f831f2de5d5c4707ebf74eb1d9ce1235b9a 100644
GIT binary patch
delta 159
zcmZn^UoOrY%FD~e00aw@Cd6-?$SccuXrp#5lUFKpN^B}iN?bEzGgG=;Dt9VpmNF2l
zq{R0!i8Dm00@-R4n2NTgs)FUzfqV^+oH<Y~B_T>PB{51XB`KIeGkNnfrgBz^DvspD
vf|BHnMExorC`+%jD5rRHEXN@x#)QcV+#&poJdc<Z`R=nQaWIN7voHbx>hmmY

delta 120
zcmZ23-YCu+%FD~e00dvl8seKK^2#!9+o)a3WS1_R%ALxYr3}O>DY3mw;tWx$K(^Wh
zrlM7;s$e;FAYTI{XAYE0iHp)qiI37sNeE`pOx*m5sho9lBgY{o#<<BY+#$S=nH2aQ
NuqbjciZHV<0sz8GAYT9g

diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py
index 328f000..e39a8ad 100644
--- a/digitaleagentur/settings.py
+++ b/digitaleagentur/settings.py
@@ -89,6 +89,7 @@ INSTALLED_APPS = [
     'channels',
     'channels_presence',
     'simple_history',
+    'captcha'
 ]
 
 MIDDLEWARE = [
diff --git a/digitaleagentur/urls.py b/digitaleagentur/urls.py
index f772138..70f4ee6 100644
--- a/digitaleagentur/urls.py
+++ b/digitaleagentur/urls.py
@@ -42,6 +42,7 @@ urlpatterns = [
     path('api-token-auth/', obtain_auth_token, name='api-token-auth'),
     path('getdoc/<path:path>/<int:agpk>', GetCryptFileRecover.as_view(), name=FETCH_URL_NAME),
     path('getdoc/<path:path>', GetCryptFile.as_view(), name=FETCH_URL_NAME),
+    path('captcha/', include('captcha.urls')),
     
     
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/requirements.txt b/requirements.txt
index 359d481..915f131 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,4 +31,5 @@ python-dateutil==2.8.1
 django-simple-history==2.11.0
 django-encrypted-filefield==0.2.2
 more-itertools==8.5.0
-django-passwords==0.3.12
\ No newline at end of file
+django-passwords==0.3.12
+django-simple-captcha=0.5.13
\ No newline at end of file
diff --git a/users/templates/users/register.html b/users/templates/users/register.html
index 76ecfe6..e44f01e 100644
--- a/users/templates/users/register.html
+++ b/users/templates/users/register.html
@@ -25,22 +25,25 @@
 			</legend>				
 				
 				{% for field in form %}
-					{{field.field_name}}
-					{% if field.name == 'agb' %}
-					{{field}}&nbsp;&nbsp;<a style="" href="{% url 'datenschutzda' %}" target="_blank">AGB's*</a><br />
-					{% elif field.name == 'av' %}
-					{{field}}&nbsp;&nbsp;<a style="" href="{% url 'impressumda' %}" target="_blank">Auftragsverarbeitung*</a>
-					{% else %}
-					{{field|as_crispy_field}}				
+					
+					{% if field.name != 'captcha' %}
+						{{field.field_name}}
+						{% if field.name == 'agb' %}
+						{{field}}&nbsp;&nbsp;<a style="" href="{% url 'datenschutzda' %}" target="_blank">AGB's*</a><br />
+						{% elif field.name == 'av' %}
+						{{field}}&nbsp;&nbsp;<a style="" href="{% url 'impressumda' %}" target="_blank">Auftragsverarbeitung*</a>
+						{% else %}
+						{{field|as_crispy_field}}				
+						{% endif %}
 					{% endif %}
 				{% endfor %}
-
-				<div class="form-check">
+				{{form.captcha|as_crispy_field}}
+				<!--<div class="form-check">
 				  <input class="form-check-input" type="checkbox" value="" id="isvve" onclick="javascript:changeVVE()">
 				  <label class="form-check-label" for="isvve">
 				    VVE-Mitglied
 				  </label>
-				</div>
+				</div>-->
 		</fieldset>
 		<div class="form-group">
 			<button type="submit" class="btn btn-success">Registrieren</button>
@@ -49,7 +52,7 @@
 </div>
 </div>
 <script type="text/javascript">
-	$(document).ready(function(){
+	/*$(document).ready(function(){
 			$("#div_id_vve").hide();
 	});
 
@@ -61,6 +64,6 @@
 		} else {
 			$("#div_id_vve").hide();
 	    }
-	}
+	}*/
 </script>
 {% endblock content %}
\ No newline at end of file
diff --git a/users/usersforms.py b/users/usersforms.py
index f437cc3..8480d6c 100644
--- a/users/usersforms.py
+++ b/users/usersforms.py
@@ -8,6 +8,8 @@ from areas.models import Areas
 from tasks.models import Tasks
 from PIL import Image
 from django.utils.translation import gettext as _
+from captcha.fields import CaptchaField
+
 
 # Standard-User-Formular - NUR Username und Password wird hier genutzt
 class UsersAddNewUser(UserCreationForm):
@@ -174,14 +176,22 @@ class SupportForm(forms.Form):
 		#self.fields["attachment_3"] = forms.FileField(label="Anhang 3", required=False)
 
 class NewAgencyForm(forms.Form):
+
+	captcha = CaptchaField()
+
+	fields = ['first_name','last_name','mail','agencyname','vve','agb','av','captcha']
+	field_order = ['first_name','last_name','mail','agencyname','vve','agb','av','captcha']
+
 	def __init__(self, *args, **kwargs):				
 		super().__init__(*args, **kwargs)		
 		self.fields['first_name'] = forms.CharField(required=True, label="Vorname")
 		self.fields['last_name'] = forms.CharField(required=True, label="Nachname")
 		self.fields['mail'] = forms.EmailField(required=True, label="E-Mail")		
 		self.fields['agencyname'] = forms.CharField(required=True, label="Agenturname")
-		self.fields['vve'] = forms.CharField(required=False, label="VVE-Mitgliedsnummer")
+		self.fields['vve'] = forms.CharField(required=True, label="VVE-Mitgliedsnummer")
 		self.fields['agb'] = forms.BooleanField(required=True, label="AGB's")
 		self.fields['av'] = forms.BooleanField(required=True, label="Auftragsverarbeitung")
+		self.fields['captcha'] = CaptchaField(required=True, label="Bitte geben Sie die Symbole ein.")
+
 		
 		
\ No newline at end of file