Do not allow blank passwords when authenticating against LDAP.

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

diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php
index c585da43c4eceefbee2db7039c1babc36480d971..b7a0e92c7f4500a38bcab5c6d6c177e9320ddd8b 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,7 +51,8 @@ class RecaptchaPlugin extends Plugin
         }
     }
 
-    function checkssl(){
+    function checkssl()
+    {
         if(common_config('site', 'ssl') === 'sometimes' || common_config('site', 'ssl') === 'always') {
             return true;
         }
@@ -62,12 +64,32 @@ class RecaptchaPlugin extends Plugin
     {
         $action->elementStart('li');
         $action->raw('<label for="recaptcha">Captcha</label>');
-        if($this->checkssl() === true) {
-            $action->raw(recaptcha_get_html($this->public_key), null, true);
-        } else { 
-            $action->raw(recaptcha_get_html($this->public_key));
-        }
+
+        // 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 ($this->checkssl()) {
+                $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;
     }
 
@@ -82,7 +104,7 @@ class RecaptchaPlugin extends Plugin
             if($this->display_errors) {
                 $action->showForm ("(reCAPTCHA error: " . $resp->error . ")");
             }
-            $action->showForm("Captcha does not match!");
+            $action->showForm(_m("Captcha does not match!"));
             return false;
         }
     }
@@ -98,4 +120,4 @@ class RecaptchaPlugin extends Plugin
                                'captcha to the registration page.'));
         return true;
     }
-}
+}
\ No newline at end of file