Several improvements in the sx importer.

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

diff --git a/forum_modules/akismet/startup.py b/forum_modules/akismet/startup.py
index 310468e467e9ab8f06e3d8ee4215d737cc8759be..1e9e731e76eeee83bbc54074b6f7673d05df67fa 100644 (file)
--- a/forum_modules/akismet/startup.py
+++ b/forum_modules/akismet/startup.py
@@ -1,12 +1,13 @@
 from django.utils.translation import ugettext as _
 from django.http import HttpResponse, HttpResponseRedirect
 from django.utils import simplejson
 from django.utils.translation import ugettext as _
 from django.http import HttpResponse, HttpResponseRedirect
 from django.utils import simplejson

+from django.utils.encoding import smart_str

 from django.shortcuts import render_to_response
 from forum.modules.decorators import decorate
 from forum import views
 from lib.akismet import Akismet
 from forum.settings import APP_URL, OSQA_VERSION
 from django.shortcuts import render_to_response
 from forum.modules.decorators import decorate
 from forum import views
 from lib.akismet import Akismet
 from forum.settings import APP_URL, OSQA_VERSION

-from settings import WORDPRESS_API_KEY, REP_TO_FOR_NO_SPAM_CHECK
+from settings import WORDPRESS_API_KEY, REP_FOR_NO_SPAM_CHECK

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


@@ -15,8 +16,8 @@ import settings
 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 request.user.is_authenticated()
 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 request.user.is_authenticated()

-             or not (request.user.is_staff and request.user.is_superuser and request.user.reputation >= REP_TO_FOR_NO_SPAM_CHECK)):
-            comment = request.POST[param]
+             or not (request.user.is_staff or request.user.is_superuser or request.user.reputation >= REP_FOR_NO_SPAM_CHECK)):
+            comment = smart_str(request.POST[param])

 
             data = {
                 "user_ip":request.META["REMOTE_ADDR"],
 
             data = {
                 "user_ip":request.META["REMOTE_ADDR"],


@@ -27,7 +28,7 @@ def check_spam(param, comment_type):
 
             if request.user.is_authenticated():
                 data.update({
 
             if request.user.is_authenticated():
                 data.update({

-                    "comment_author":request.user.username,
+                    "comment_author":smart_str(request.user.username),

                     "comment_author_email":request.user.email,
                     "comment_author_url":request.user.website,    
                 })
                     "comment_author_email":request.user.email,
                     "comment_author_url":request.user.website,    
                 })