From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Sun, 31 Jul 2011 16:13:55 +0000 (+0000)
Subject: check whether the recaptcha public and private keys have been provided before populat... 
X-Git-Tag: live~175
X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/9bee23ed8d6c06f5f000f8951d8cb37953d214d1

check whether the recaptcha public and private keys have been provided before populating the recaptcha fields to the local auth form

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

diff --git a/forum_modules/localauth/forms.py b/forum_modules/localauth/forms.py
index 9529bba..6facc5d 100644
--- a/forum_modules/localauth/forms.py
+++ b/forum_modules/localauth/forms.py
@@ -7,6 +7,8 @@ from django.contrib.auth import authenticate
 from django import forms
 import logging
 
+from forum.settings import RECAPTCHA_PUB_KEY, RECAPTCHA_PRIV_KEY
+
 class ClassicRegisterForm(SetPasswordForm):
     """ legacy registration form """
 
@@ -17,15 +19,16 @@ class ClassicRegisterForm(SetPasswordForm):
     def __init__(self, *args, **kwargs):
         super(ClassicRegisterForm, self).__init__(*args, **kwargs)
 
-        spam_fields = call_all_handlers('create_anti_spam_field')
-        if spam_fields:
-            spam_fields = dict(spam_fields)
-            for name, field in spam_fields.items():
-                self.fields[name] = field
+        if len(str(RECAPTCHA_PUB_KEY.value)) > 0 and len(str(RECAPTCHA_PRIV_KEY.value)) > 0:
+            spam_fields = call_all_handlers('create_anti_spam_field')
+            if spam_fields:
+                spam_fields = dict(spam_fields)
+                for name, field in spam_fields.items():
+                    self.fields[name] = field
 
-            self._anti_spam_fields = spam_fields.keys()
-        else:
-            self._anti_spam_fields = []
+                self._anti_spam_fields = spam_fields.keys()
+            else:
+                self._anti_spam_fields = []
 
     def anti_spam_fields(self):
         return [self[name] for name in self._anti_spam_fields]