X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FRecaptcha%2FRecaptchaPlugin.php;h=5a33e7132e101faeb83bdd76968f9b894cf5aa66;hb=17afe068059f426db04c4b2bf85d31bf4e03953a;hp=db118dbb810dcf5ce946fc5b066e68ef7ff64ecc;hpb=684e65e3dea09fd8179f86d846b82540cc44e5dc;p=quix0rs-gnu-social.git
diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php
index db118dbb81..5a33e7132e 100644
--- a/plugins/Recaptcha/RecaptchaPlugin.php
+++ b/plugins/Recaptcha/RecaptchaPlugin.php
@@ -2,7 +2,7 @@
/**
* StatusNet, the distributed open-source microblogging tool
*
- * Plugin to show reCaptcha when a user registers
+ * Plugin to show reCaptcha when a user registers
*
* PHP version 5
*
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
-define('RECAPTCHA', '0.2');
-
require_once(INSTALLDIR.'/plugins/Recaptcha/recaptchalib.php');
class RecaptchaPlugin extends Plugin
@@ -43,7 +41,8 @@ class RecaptchaPlugin extends Plugin
var $failed;
var $ssl;
- function onInitializePlugin(){
+ function onInitializePlugin()
+ {
if(!isset($this->private_key)) {
common_log(LOG_ERR, 'Recaptcha: Must specify private_key in config.php');
}
@@ -52,25 +51,36 @@ class RecaptchaPlugin extends Plugin
}
}
- function checkssl(){
- if(common_config('site', 'ssl') === 'sometimes' || common_config('site', 'ssl') === 'always') {
- return true;
- }
- return false;
- }
-
-
function onEndRegistrationFormData($action)
{
- $action->style('#recaptcha_area{float:left;}');
$action->elementStart('li');
- $action->raw('');
- if($this->checkssl() === true) {
- $action->raw(recaptcha_get_html($this->public_key), null, true);
- } else {
- $action->raw(recaptcha_get_html($this->public_key));
- }
+ $action->raw('');
+
+ // AJAX API will fill this div out.
+ // We're calling that instead of the regular one so we stay compatible
+ // with application/xml+xhtml output as for mobile.
+ $action->element('div', array('id' => 'recaptcha'));
$action->elementEnd('li');
+
+ $action->recaptchaPluginNeedsOutput = true;
+ return true;
+ }
+
+ function onEndShowScripts($action)
+ {
+ if (isset($action->recaptchaPluginNeedsOutput) && $action->recaptchaPluginNeedsOutput) {
+ // Load the AJAX API
+ if (StatusNet::isHTTPS()) {
+ $url = "https://api-secure.recaptcha.net/js/recaptcha_ajax.js";
+ } else {
+ $url = "http://api.recaptcha.net/js/recaptcha_ajax.js";
+ }
+ $action->script($url);
+
+ // And when we're ready, fill out the captcha!
+ $key = json_encode($this->public_key);
+ $action->inlinescript("\$(function(){Recaptcha.create($key, 'recaptcha');});");
+ }
return true;
}
@@ -83,10 +93,22 @@ class RecaptchaPlugin extends Plugin
if (!$resp->is_valid) {
if($this->display_errors) {
- $action->showForm ("(reCAPTCHA error: " . $resp->error . ")");
+ $action->showForm(sprintf(_("(reCAPTCHA error: %s)", $resp->error)));
}
- $action->showForm("Captcha does not match!");
+ $action->showForm(_m("Captcha does not match!"));
return false;
}
}
+
+ function onPluginVersion(&$versions)
+ {
+ $versions[] = array('name' => 'Recaptcha',
+ 'version' => STATUSNET_VERSION,
+ 'author' => 'Eric Helgeson',
+ 'homepage' => 'http://status.net/wiki/Plugin:Recaptcha',
+ 'rawdescription' =>
+ _m('Uses Recaptcha service to add a '.
+ 'captcha to the registration page.'));
+ return true;
+ }
}