fixes OSQA-562, Mixed-up markdown mangling of simple comment text

[osqa.git] / forum_modules / akismet / startup.py

diff --git a/forum_modules/akismet/startup.py b/forum_modules/akismet/startup.py
index 159efe17663b9172aa7ae99d4d007ee94eccbed1..d587ea1c00d9f6adefb5da9c767bae7a44912e34 100644 (file)
--- a/forum_modules/akismet/startup.py
+++ b/forum_modules/akismet/startup.py
@@ -7,20 +7,20 @@ from forum.modules import decorate
 from forum import views
 from lib.akismet import Akismet
 from forum.settings import APP_URL, OSQA_VERSION
 from forum import views
 from lib.akismet import Akismet
 from forum.settings import APP_URL, OSQA_VERSION

-from settings import WORDPRESS_API_KEY, REP_FOR_NO_SPAM_CHECK
+from settings import WORDPRESS_API_KEY, REP_FOR_NO_SPAM_CHECK, RECAPTCHA_PUB_KEY, RECAPTCHA_PRIV_KEY

 from forum.models.user import User
 from forum.models.user import User

+from forum.forms.general import SimpleCaptchaForm

 
 import settings
 
 def can_bypass_spam_check(user):
 
 import settings
 
 def can_bypass_spam_check(user):

-    return user.is_authenticated() and (user.is_superuser or user.is_staff or cmp(user.reputation, REP_FOR_NO_SPAM_CHECK
-                                                                                  ) > 0)
+    return user.is_authenticated and (user.is_superuser or user.is_staff or cmp(int(user.reputation), REP_FOR_NO_SPAM_CHECK) > 0)

 
 
 def check_spam(param, comment_type):
     def wrapper(origin, request, *args, **kwargs):
 
 
 def check_spam(param, comment_type):
     def wrapper(origin, request, *args, **kwargs):

-        if request.POST and request.POST.get(param, None) and WORDPRESS_API_KEY and (not can_bypass_spam_check(
-                request.user)):
+        if request.POST and request.POST.get(param, None) and WORDPRESS_API_KEY and (not can_bypass_spam_check(request.user)):
+        

             comment = smart_str(request.POST[param])
 
             data = {
             comment = smart_str(request.POST[param])
 
             data = {


@@ -39,6 +39,9 @@ def check_spam(param, comment_type):
 
             api = Akismet(settings.WORDPRESS_API_KEY, APP_URL, "OSQA/%s" % OSQA_VERSION)
             if api.comment_check(comment, data):
 
             api = Akismet(settings.WORDPRESS_API_KEY, APP_URL, "OSQA/%s" % OSQA_VERSION)
             if api.comment_check(comment, data):

+                post_data = request.POST
+                captcha_form = SimpleCaptchaForm(request.POST)
+                

                 if request.is_ajax():
                     response = {
                     'success': False,
                 if request.is_ajax():
                     response = {
                     'success': False,


@@ -46,9 +49,18 @@ def check_spam(param, comment_type):
                     }
                     return HttpResponse(simplejson.dumps(response), mimetype="application/json")
                 else:
                     }
                     return HttpResponse(simplejson.dumps(response), mimetype="application/json")
                 else:

-                    return render_to_response('modules/akismet/foundspam.html', {
-                    'action_name': comment_type
-                    })
+                    captcha_checked = False
+                    
+                    if RECAPTCHA_PUB_KEY and RECAPTCHA_PRIV_KEY:
+                        if captcha_form.is_valid():
+                            captcha_checked = True
+                    
+                    if not captcha_checked:
+                        return render_to_response('modules/akismet/foundspam.html', {
+                        'action_name': comment_type,
+                        'post_data' : post_data,
+                        'captcha_form' : captcha_form,
+                        })

 
         return origin(request, *args, **kwargs)
 
 
         return origin(request, *args, **kwargs)
 


@@ -58,5 +70,3 @@ def check_spam(param, comment_type):
 decorate(views.writers.ask)(check_spam('text', _('question')))
 decorate(views.writers.answer)(check_spam('text', _('answer')))
 decorate(views.commands.comment)(check_spam('comment', _('comment')))
 decorate(views.writers.ask)(check_spam('text', _('question')))
 decorate(views.writers.answer)(check_spam('text', _('answer')))
 decorate(views.commands.comment)(check_spam('comment', _('comment')))

-
-