GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

RecaptchaPlugin: fix for missing captcha on iPhone/Android.

Browse Source 
MobileProfile serves pages out to iPhone and Android as application/xhtml+xml, which doesn't work with the default we we were loading recaptcha (as it used document.write). Switched to filling out a <div> from the AJAX API, which doesn't use document.write in the XHTML context.

Tested that view & submission works ok in following browsers:
Mobile: iPhone 3.1, Android 2.1, iPad 3.2 (this last doesn't trigger mobile theme tweaks)
Ubuntu 10.04: Firefox 3.6.3, Chrome 6
Mac 10.6: Safari 5/OS X 10.6.4
Windows 7: IE 8, Opera 10.56
This commit is contained in:
Brion Vibber 2010-06-20 19:30:12 +00:00
parent 9d890e2be0
commit 2e98a48f2b
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/Recaptcha/RecaptchaPlugin.php
View File

@ -62,12 +62,29 @@ class RecaptchaPlugin extends Plugin
{ {
$action->elementStart('li'); $action->elementStart('li');
$action->raw('<label for="recaptcha">Captcha</label>'); $action->raw('<label for="recaptcha">Captcha</label>');
if($this->checkssl() === true) {
$action->raw(recaptcha_get_html($this->public_key), null, true); // AJAX API will fill this div out.
} else { // We're calling that instead of the regular one so we stay compatible
$action->raw(recaptcha_get_html($this->public_key)); // with application/xml+xhtml output as for mobile.
} $action->element('div', array('id' => 'recaptcha'));
$action->elementEnd('li'); $action->elementEnd('li');
$action->recaptchaPluginNeedsOutput = true;
return true;
}
function onEndShowScripts($action)
{
if (isset($action->recaptchaPluginNeedsOutput) && $action->recaptchaPluginNeedsOutput) {
// Load the AJAX API
$proto = $this->checkssl() ? 'https' : 'http';
$url = "$proto://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; return true;
} }