Merged with team repository.

boards/utils.py

@@ -0,0 +1,13 b''
+"""
+This module contains helper functions and helper classes.
+"""
+
+
+def check_if_human(request):
+    """
+    Check if request is made by a user.
+    It contains rules which check for bots.
+    """
+
+    # FIXME: need to insert checking logic
+    return True

boards/forms.py

@@ -1,4 +1,5 b''
 import re
+from captcha.fields import CaptchaField
 from django import forms
 from django.forms.util import ErrorList
 from boards.models import TITLE_MAX_LENGTH
@@ -66,6 +67,10 b' class PostForm(forms.Form):'
             self._errors['image'] = self.error_class([error_message])
 
 
+class PostCaptchaForm(PostForm):
+    captcha = CaptchaField()
+
+
 class ThreadForm(PostForm):
     regex_tags = re.compile(ur'^[\w\s\d]+$', re.UNICODE)
     tags = forms.CharField(max_length=100)
@@ -86,5 +91,10 b' class ThreadForm(PostForm):'
         return cleaned_data
 
 
+class ThreadCaptchaForm(ThreadForm):
+    captcha = CaptchaField()
+
+
+
 class SettingsForm(forms.Form):
     theme = forms.ChoiceField(choices=settings.THEMES, widget=forms.RadioSelect)
  No newline at end of file

boards/urls.py

@@ -1,4 +1,4 b''
-from django.conf.urls import patterns, url
+from django.conf.urls import patterns, url, include
 from boards import views
 
 urlpatterns = patterns('',
@@ -23,3 +23,8 b" urlpatterns = patterns('',"
     url(r'^settings$', views.settings, name='settings'),
     url(r'^tags$', views.all_tags, name='tags'),
 )
+
+#enable captcha support
+urlpatterns += patterns('',
+    url(r'^captcha/', include('captcha.urls')),
+)

boards/views.py

@@ -5,7 +5,10 b' from django.http import HttpResponseRedi'
 
 from boards import forms
 import boards
-from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList
+from boards import utils
+from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \
+    ThreadCaptchaForm, PostCaptchaForm
+
 from boards.models import Post, Admin, Tag
 import neboard
 
@@ -13,13 +16,18 b' import neboard'
 def index(request, page=0):
     context = RequestContext(request)
 
+    threadFormClass = (ThreadForm
+                       if utils.check_if_human(request)
+                       else ThreadCaptchaForm)
+
     if request.method == 'POST':
-        form = ThreadForm(request.POST, request.FILES,
+        form = threadFormClass(request.POST, request.FILES,
                           error_class=PlainErrorList)
+
         if form.is_valid():
             return _new_post(request, form)
     else:
-        form = forms.ThreadForm(error_class=PlainErrorList)
+        form = threadFormClass(error_class=PlainErrorList)
 
     threads = Post.objects.get_threads(page=int(page))
 
@@ -111,13 +119,17 b' def tag(request, tag_name, page=0):'
 def thread(request, post_id):
     """Get all thread posts"""
 
+    postFormClass = (PostForm
+                       if utils.check_if_human(request)
+                       else PostCaptchaForm)
+
     if request.method == 'POST':
-        form = PostForm(request.POST, request.FILES,
+        form = postFormClass(request.POST, request.FILES,
                         error_class=PlainErrorList)
         if form.is_valid():
             return _new_post(request, form, post_id)
     else:
-        form = forms.PostForm(error_class=PlainErrorList)
+        form = postFormClass(error_class=PlainErrorList)
 
     posts = Post.objects.get_thread(post_id)
 

dependency_list.txt

@@ -3,4 +3,4 b' django >= 1.5'
 django_cleanup
 django-markupfield
 markdown
-
+django-simple-captcha

neboard/settings.py

@@ -138,8 +138,14 b' INSTALLED_APPS = ('
     'django.contrib.markup',
     'django_cleanup',
     'boards',
+    'captcha',
 )
 
+# TODO: NEED DESIGN FIXES
+CAPTCHA_OUTPUT_FORMAT = (u' %(hidden_field)s '
+                         u'<div class="form-label">%(image)s</div>'
+                         u'<div class="form-text">%(text_field)s</div>')
+
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.

templates/posting_general.html

@@ -103,6 +103,7 b''
 
     <form enctype="multipart/form-data" method="post">{% csrf_token %}
     <div class="post-form-w">
+
         <div class="form-title">{% trans "Create new thread" %}</div>
         <div class="post-form">
         <div class="form-row">
@@ -126,8 +127,12 b''
             <div class="form-errors">{{ form.tags.errors }}</div>
         </div>
         </div>
-        <div class="form-submit"><input type="submit"
-            value="{% trans "Post" %}"/></div>
+        <div class="form-submit">
+            <BR />
+            {{ form.captcha }}
+            <BR />
+
+            <input type="submit" value="{% trans "Post" %}"/></div>
         <div>Tags must be delimited by spaces. Text or image is required
             </div>
         <div>Use <a

templates/thread.html

@@ -82,6 +82,11 b''
                     <div class="form-errors">{{ form.image.errors }}</div>
                 </div>
             </div>
+
+            <BR />
+            {{ form.captcha }}
+            <BR />
+
             <div class="form-submit"><input type="submit"
                                             value="{% trans "Post" %}"/></div>
             <div>Use <a