From: matt <matt@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Sat, 8 May 2010 13:35:37 +0000 (+0000)
Subject: made isSpam just return False and removed the settings for Wordpress API.  Something... 
X-Git-Tag: live~958
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/08dbd720394d897a295fd610d30990b9fad26a04

made isSpam just return False and removed the settings for Wordpress API.  Something is funky and may not have been merged with the Experimental branch.

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

diff --git a/forum/models/node.py b/forum/models/node.py
index 7c09189..dc292fb 100644
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -257,16 +257,18 @@ class Node(BaseModel, NodeContent):
 
     @staticmethod
     def isSpam(comment, data):
-        api = Akismet()
+        #api = Akismet()
+
+        #if not api.key:
+        #    return False
+        #else:
+        #    if api.comment_check(comment, data):
+        #        return True
+        #    else:
+        #        return False
+        # return data
+        return False
 
-        if not api.key:
-            return False
-        else:
-            if api.comment_check(comment, data):
-                return True
-            else:
-                return False
-        return data
 
     class Meta:
         app_label = 'forum'
diff --git a/forum/settings/extkeys.py b/forum/settings/extkeys.py
index abe860b..9b38a16 100644
--- a/forum/settings/extkeys.py
+++ b/forum/settings/extkeys.py
@@ -12,15 +12,16 @@ GOOGLE_ANALYTICS_KEY = Setting('GOOGLE_ANALYTICS_KEY', '', EXT_KEYS_SET, dict(
 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>"),
 required=False))
-WORDPRESS_API_KEY = Setting('WORDPRESS_API_KEY', '', EXT_KEYS_SET, dict(
-label = _("Wordpress API key"),
-help_text = _("Your Wordpress API key. You can get one at <a href='http://wordpress.com/'>http://wordpress.com/</a>"),
-required=False))
 
-WORDPRESS_BLOG_URL = Setting('WORDPRESS_BLOG_URL', '', EXT_KEYS_SET, dict(
-label = _("Wordpress blog url"),
-help_text = _("Your Wordpress blog url. You can get one at <a href='http://wordpress.com/'>http://wordpress.com/</a>"),
-required=False))
+#WORDPRESS_API_KEY = Setting('WORDPRESS_API_KEY', '', EXT_KEYS_SET, dict(
+#label = _("Wordpress API key"),
+#help_text = _("Your Wordpress API key. You can get one at <a href='http://wordpress.com/'>http://wordpress.com/</a>"),
+#required=False))
+
+#WORDPRESS_BLOG_URL = Setting('WORDPRESS_BLOG_URL', '', EXT_KEYS_SET, dict(
+#label = _("Wordpress blog url"),
+#help_text = _("Your Wordpress blog url. You can get one at <a href='http://wordpress.com/'>http://wordpress.com/</a>"),
+#required=False))