aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2009-06-21 13:31:26 +0000
committerHenry Sudhof <kellanved@phpbb.com>2009-06-21 13:31:26 +0000
commitc2c79d8297369fa461976061e0b7b95dd8c8a721 (patch)
treeb41f2f7f49f514e187f11a101601e7a202c18dea /phpBB/adm/style
parentafc0ef93c51f659247f4942a3691405d95947383 (diff)
downloadforums-c2c79d8297369fa461976061e0b7b95dd8c8a721.tar
forums-c2c79d8297369fa461976061e0b7b95dd8c8a721.tar.gz
forums-c2c79d8297369fa461976061e0b7b95dd8c8a721.tar.bz2
forums-c2c79d8297369fa461976061e0b7b95dd8c8a721.tar.xz
forums-c2c79d8297369fa461976061e0b7b95dd8c8a721.zip
fix the captcha ACP, restore xhtml compliance for recaptcha (#46195) - note, that this will not work in IE
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9645 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style')
-rwxr-xr-xphpBB/adm/style/captcha_gd_acp.html3
-rw-r--r--phpBB/adm/style/captcha_recaptcha.html16
-rw-r--r--phpBB/adm/style/captcha_recaptcha_acp.html2
3 files changed, 14 insertions, 7 deletions
diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html
index ea7a851be3..f4755a37da 100755
--- a/phpBB/adm/style/captcha_gd_acp.html
+++ b/phpBB/adm/style/captcha_gd_acp.html
@@ -54,8 +54,9 @@
<h3>{L_WARNING}</h3>
<p>{L_CAPTCHA_PREVIEW_MSG}</p>
</div>
+ <!-- INCLUDE {CAPTCHA_PREVIEW} -->
<!-- ENDIF -->
-{CAPTCHA_PREVIEW}
+
</fieldset>
<fieldset class="submit-buttons">
diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html
index f325c3727d..0cb43cf01f 100644
--- a/phpBB/adm/style/captcha_recaptcha.html
+++ b/phpBB/adm/style/captcha_recaptcha.html
@@ -1,5 +1,6 @@
<!-- IF S_RECAPTCHA_AVAILABLE -->
- <dl>
+ <dl>
+ <dd>
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[
var RecaptchaOptions = {
@@ -7,12 +8,17 @@
};
// ]]>
</script>
-
- <noscript>
- <iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br/>
+
+
+ <noscript>
+ <div>
+ <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
- <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
+ <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
+ </div>
</noscript>
+
+ </dd>
</dl>
<!-- ELSE -->
{L_RECAPTCHA_NOT_AVAILABLE}
diff --git a/phpBB/adm/style/captcha_recaptcha_acp.html b/phpBB/adm/style/captcha_recaptcha_acp.html
index 07751d1d03..78f035a01d 100644
--- a/phpBB/adm/style/captcha_recaptcha_acp.html
+++ b/phpBB/adm/style/captcha_recaptcha_acp.html
@@ -31,7 +31,7 @@
<p>{L_CAPTCHA_PREVIEW_MSG}</p>
</div>
<!-- ENDIF -->
-{CAPTCHA_PREVIEW}
+<!-- include {CAPTCHA_PREVIEW} -->
</fieldset>
<fieldset class="submit-buttons">