Fixed akismet settings and object instantiation code

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@173 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/akismet.py b/forum/akismet.py
index 4138d5ad1453b4f413e860a8ec20fa7b00526cab..7513d9d1c1edc0fb9b4ca5a2fa23fdbe1b33fb65 100644 (file)
--- a/forum/akismet.py
+++ b/forum/akismet.py
@@ -119,8 +119,7 @@ class Akismet(object):
         if agent is None:
             agent = DEFAULTAGENT % __version__
         self.user_agent = user_agent % (agent, __version__)
-        self.key = str(settings.WORDPRESS_API_KEY)
-        self.blog_url = str(settings.WORDPRESS_BLOG_URL)
+        self.setAPIKey(key, blog_url)
 
 
     def _getURL(self):

diff --git a/forum/models/node.py b/forum/models/node.py
index dc292fb22b41126d76d667b1eefe02c33b60550b..19973e9e3c4744c20e3ce490c72a1d753e8e44ba 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -257,18 +257,11 @@ class Node(BaseModel, NodeContent):
 \r
     @staticmethod\r
     def isSpam(comment, data):\r
-        #api = Akismet()\r
-\r
-        #if not api.key:\r
-        #    return False\r
-        #else:\r
-        #    if api.comment_check(comment, data):\r
-        #        return True\r
-        #    else:\r
-        #        return False\r
-        # return data\r
-        return False\r
-\r
+        if not settings.WORDPRESS_API_KEY:\r
+            return False\r
+            \r
+        api = Akismet(settings.WORDPRESS_API_KEY, settings.APP_URL)\r
+        return api.comment_check(comment, data)\r
 \r
     class Meta:\r
         app_label = 'forum'\r

diff --git a/forum/settings/extkeys.py b/forum/settings/extkeys.py
index 9b38a168c1457876d1eee94de5b20667b325dde4..16afd7c4074384c9ad2299b76f13233d0b87c5cf 100644 (file)
--- a/forum/settings/extkeys.py
+++ b/forum/settings/extkeys.py
@@ -13,16 +13,7 @@ label = _("Google analytics key"),
 help_text = _("Your Google analytics key. You can get one at the <a href='http://www.google.com/analytics/'>Google analytics official website</a>"),\r
 required=False))\r
 \r
-#WORDPRESS_API_KEY = Setting('WORDPRESS_API_KEY', '', EXT_KEYS_SET, dict(\r
-#label = _("Wordpress API key"),\r
-#help_text = _("Your Wordpress API key. You can get one at <a href='http://wordpress.com/'>http://wordpress.com/</a>"),\r
-#required=False))\r
-\r
-#WORDPRESS_BLOG_URL = Setting('WORDPRESS_BLOG_URL', '', EXT_KEYS_SET, dict(\r
-#label = _("Wordpress blog url"),\r
-#help_text = _("Your Wordpress blog url. You can get one at <a href='http://wordpress.com/'>http://wordpress.com/</a>"),\r
-#required=False))\r
-\r
-\r
-\r
-\r
+WORDPRESS_API_KEY = Setting('WORDPRESS_API_KEY', '', EXT_KEYS_SET, dict(\r
+label = _("Wordpress API key"),\r
+help_text = _("Your Wordpress API key. You can get one at <a href='http://wordpress.com/'>http://wordpress.com/</a>"),\r
+required=False))\r