From c7ac70035549f2557552a73dd619ff6c2013d9d7 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 27 Jul 2012 16:53:34 -0500 Subject: [PATCH] fixed Recapcha, thanks Osman Masood --- VERSION | 2 +- gluon/tools.py | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 3159a75d..e4e31c82 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-07-27 09:32:24) dev +Version 2.00.0 (2012-07-27 16:53:30) dev diff --git a/gluon/tools.py b/gluon/tools.py index 28e7129b..86d063f5 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -662,13 +662,24 @@ class Mail(object): class Recaptcha(DIV): + """ + Usage: + + form = FORM(Recaptcha(public_key='...',private_key='...')) + + or + + form = SQLFORM(...) + form.append(Recaptcha(public_key='...',private_key='...')) + """ + API_SSL_SERVER = 'https://www.google.com/recaptcha/api' API_SERVER = 'http://www.google.com/recaptcha/api' VERIFY_SERVER = 'http://www.google.com/recaptcha/api/verify' def __init__( self, - request, + request=None, public_key='', private_key='', use_ssl=False, @@ -677,6 +688,7 @@ class Recaptcha(DIV): label = 'Verify:', options = '' ): + self.request_vars = request and request.vars or current.request.vars self.remote_addr = request.env.remote_addr self.public_key = public_key self.private_key = private_key