X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2FRecaptcha%2FRecaptchaPlugin.php;h=48754ffab4309045b395cf3e56113835a86a49d1;hb=546a03b5eac5f172d543a889625e2f4de446e8b7;hp=08557cbd8481b8cb77c77cf6936c2ec3b0828c36;hpb=aa02f6020e16f722d5194ad97e66a57ab1d8c29c;p=quix0rs-gnu-social.git
diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php
index 08557cbd84..48754ffab4 100644
--- a/plugins/Recaptcha/RecaptchaPlugin.php
+++ b/plugins/Recaptcha/RecaptchaPlugin.php
@@ -51,18 +51,10 @@ 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->elementStart('li');
+ // TRANS: Field label.
$action->raw('');
// AJAX API will fill this div out.
@@ -79,10 +71,10 @@ class RecaptchaPlugin extends Plugin
{
if (isset($action->recaptchaPluginNeedsOutput) && $action->recaptchaPluginNeedsOutput) {
// Load the AJAX API
- if ($this->checkssl()) {
- $url = "https://api-secure.recaptcha.net/js/recaptcha_ajax.js";
+ if (StatusNet::isHTTPS()) {
+ $url = "https://www.google.com/recaptcha/api/js/recaptcha_ajax.js";
} else {
- $url = "http://api.recaptcha.net/js/recaptcha_ajax.js";
+ $url = "http://www.google.com/recaptcha/api/js/recaptcha_ajax.js";
}
$action->script($url);
@@ -102,22 +94,26 @@ class RecaptchaPlugin extends Plugin
if (!$resp->is_valid) {
if($this->display_errors) {
- $action->showForm(sprintf(_("(reCAPTCHA error: %s)", $resp->error)));
+ // TRANS: Error message displayed if there is in error communicating with the
+ // TRANS: reCAPTCHA server. %s is the error.
+ $action->showForm(sprintf(_m('(reCAPTCHA error: %s)', $resp->error)));
}
- $action->showForm(_m("Captcha does not match!"));
+ // TRANS: Error message displayed if a provided captcha response does not match.
+ $action->showForm(_m('Captcha does not match!'));
return false;
}
}
- function onPluginVersion(&$versions)
+ function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Recaptcha',
- 'version' => STATUSNET_VERSION,
+ 'version' => GNUSOCIAL_VERSION,
'author' => 'Eric Helgeson',
'homepage' => 'http://status.net/wiki/Plugin:Recaptcha',
'rawdescription' =>
+ // TRANS: Plugin description.
_m('Uses Recaptcha service to add a '.
'captcha to the registration page.'));
return true;
}
-}
\ No newline at end of file
+}