eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

Browse Source 
Conflicts:
	actions/hostmeta.php
	actions/imsettings.php
	classes/User.php
	lib/adminpanelaction.php
	lib/channel.php
	lib/default.php
	lib/router.php
	lib/util.php
This commit is contained in:
Brion Vibber
2010-10-04 12:54:36 -07:00
parent 2db8aa3ec3 1652ded48c
commit 59119482ca
1105 changed files with 122118 additions and 26486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/Recaptcha/RecaptchaPlugin.php
View File

@@ -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
*
@@ -63,14 +63,14 @@ class RecaptchaPlugin extends Plugin
function onEndRegistrationFormData($action)
{
$action->elementStart('li');
$action->raw('<label for="recaptcha">Captcha</label>');
$action->raw('<label for="recaptcha">'._m('Captcha').'</label>');
// 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;
}
@@ -85,7 +85,7 @@ class RecaptchaPlugin extends Plugin
$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');});");
@@ -102,7 +102,7 @@ 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(_m("Captcha does not match!"));
return false;