Commit ee1de5e9 authored by Kostas Papadimitriou's avatar Kostas Papadimitriou
Browse files

Configurable captcha options

parent f8c4c1b1
...@@ -56,3 +56,5 @@ CLOUD_SERVICES = getattr(settings, 'ASTAKOS_CLOUD_SERVICES', ( ...@@ -56,3 +56,5 @@ CLOUD_SERVICES = getattr(settings, 'ASTAKOS_CLOUD_SERVICES', (
# Set recaptcha keys # Set recaptcha keys
RECAPTCHA_PUBLIC_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PUBLIC_KEY', '') RECAPTCHA_PUBLIC_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PUBLIC_KEY', '')
RECAPTCHA_PRIVATE_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PRIVATE_KEY', '') RECAPTCHA_PRIVATE_KEY = getattr(settings, 'ASTAKOS_RECAPTCHA_PRIVATE_KEY', '')
RECAPTCHA_OPTIONS = getattr(settings, 'ASTAKOS_RECAPTCHA_OPTIONS', {'theme': 'white'})
# Copyright 2011-2012 GRNET S.A. All rights reserved. # Copyright 2011-2012 GRNET S.A. All rights reserved.
# #
# Redistribution and use in source and binary forms, with or # Redistribution and use in source and binary forms, with or
# without modification, are permitted provided that the following # without modification, are permitted provided that the following
# conditions are met: # conditions are met:
# #
# 1. Redistributions of source code must retain the above # 1. Redistributions of source code must retain the above
# copyright notice, this list of conditions and the following # copyright notice, this list of conditions and the following
# disclaimer. # disclaimer.
# #
# 2. Redistributions in binary form must reproduce the above # 2. Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following # copyright notice, this list of conditions and the following
# disclaimer in the documentation and/or other materials # disclaimer in the documentation and/or other materials
# provided with the distribution. # provided with the distribution.
# #
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS # THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
...@@ -25,21 +25,29 @@ ...@@ -25,21 +25,29 @@
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE. # POSSIBILITY OF SUCH DAMAGE.
# #
# The views and conclusions contained in the software and # The views and conclusions contained in the software and
# documentation are those of the authors and should not be # documentation are those of the authors and should not be
# interpreted as representing official policies, either expressed # interpreted as representing official policies, either expressed
# or implied, of GRNET S.A. # or implied, of GRNET S.A.
import recaptcha.client.captcha as captcha import recaptcha.client.captcha as captcha
from django import forms from django import forms
from django.utils.safestring import mark_safe
from django.utils import simplejson as json
from astakos.im.settings import RECAPTCHA_PUBLIC_KEY from astakos.im.settings import RECAPTCHA_PUBLIC_KEY, RECAPTCHA_OPTIONS
class RecaptchaWidget(forms.Widget): class RecaptchaWidget(forms.Widget):
""" A Widget which "renders" the output of captcha.displayhtml """ """ A Widget which "renders" the output of captcha.displayhtml """
def render(self, *args, **kwargs): def render(self, *args, **kwargs):
return captcha.displayhtml(RECAPTCHA_PUBLIC_KEY) conf = RECAPTCHA_OPTIONS
recaptcha_conf = ('<script type="text/javascript">'
'var RecaptchaOptions = %s'
'</script>') % json.dumps(conf)
return mark_safe(recaptcha_conf + \
captcha.displayhtml(RECAPTCHA_PUBLIC_KEY))
class DummyWidget(forms.Widget): class DummyWidget(forms.Widget):
""" """
...@@ -50,4 +58,4 @@ class DummyWidget(forms.Widget): ...@@ -50,4 +58,4 @@ class DummyWidget(forms.Widget):
# make sure that labels are not displayed either # make sure that labels are not displayed either
is_hidden=True is_hidden=True
def render(self, *args, **kwargs): def render(self, *args, **kwargs):
return '' return ''
\ No newline at end of file
...@@ -56,5 +56,6 @@ ...@@ -56,5 +56,6 @@
# http://www.google.com/recaptcha/whyrecaptcha # http://www.google.com/recaptcha/whyrecaptcha
#ASTAKOS_RECAPTCHA_PUBLIC_KEY = '' #ASTAKOS_RECAPTCHA_PUBLIC_KEY = ''
#ASTAKOS_RECAPTCHA_PRIVATE_KEY = '' #ASTAKOS_RECAPTCHA_PRIVATE_KEY = ''
#ASTAKOS_RECAPTCHA_OPTIONS = {'theme':'white'}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment