Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / Recaptcha / RecaptchaPlugin.php

diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php
index 4e28e850ccd3d37b3e44a96aed5a7ea77f933aaa..f205b4c15ac0ce8fc73f2c81d7a807fe38be4e7d 100644 (file)
--- a/plugins/Recaptcha/RecaptchaPlugin.php
+++ b/plugins/Recaptcha/RecaptchaPlugin.php
@@ -41,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');
         }
@@ -50,17 +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('<label for="recaptcha">'._m('Captcha').'</label>');
 
         // AJAX API will fill this div out.
@@ -73,11 +67,11 @@ class RecaptchaPlugin extends Plugin
         return true;
     }
 
-    function onEndShowScripts($action)
+    function onEndShowScripts(Action $action)
     {
         if (isset($action->recaptchaPluginNeedsOutput) && $action->recaptchaPluginNeedsOutput) {
             // Load the AJAX API
-            if (StatusNet::isHTTPS()) {
+            if (GNUsocial::isHTTPS()) {
                 $url = "https://www.google.com/recaptcha/api/js/recaptcha_ajax.js";
             } else {
                 $url = "http://www.google.com/recaptcha/api/js/recaptcha_ajax.js";
@@ -91,7 +85,17 @@ class RecaptchaPlugin extends Plugin
         return true;
     }
 
-    function onStartRegistrationTry($action)
+    /**
+     * Called when someone tries to register.
+     *
+     * We check the IP here to determine if it goes over any of our
+     * configured limits.
+     *
+     * @param Action $action Action that is being executed
+     *
+     * @return boolean hook value
+     */
+    function onStartRegistrationTry(Action $action)
     {
         $resp = recaptcha_check_answer ($this->private_key,
                                         $_SERVER["REMOTE_ADDR"],
@@ -100,20 +104,24 @@ 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 <a href="http://recaptcha.org/">Recaptcha</a> service to add a  '.
                                'captcha to the registration page.'));
         return true;