diff options
author | Henry Sudhof <kellanved@phpbb.com> | 2009-06-02 14:12:23 +0000 |
---|---|---|
committer | Henry Sudhof <kellanved@phpbb.com> | 2009-06-02 14:12:23 +0000 |
commit | b776d02682492077a4fafd8835d7c4a17e50762d (patch) | |
tree | 0c94c7e662baaaf047f1eace9658bd13fc36b8e3 /phpBB/styles | |
parent | b9ece6bdfe65b2e63c42d4a83fd831b4377e1b90 (diff) | |
download | forums-b776d02682492077a4fafd8835d7c4a17e50762d.tar forums-b776d02682492077a4fafd8835d7c4a17e50762d.tar.gz forums-b776d02682492077a4fafd8835d7c4a17e50762d.tar.bz2 forums-b776d02682492077a4fafd8835d7c4a17e50762d.tar.xz forums-b776d02682492077a4fafd8835d7c4a17e50762d.zip |
Okay, a first ci of the new captcha plugins. We'll add dynamic template includes later, as well as documentation on how to use this. I'm prepared to get yelled at for bugs (oh, I know that there are plenty); but please blame spammers for broken styles and MODs.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9524 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles')
10 files changed, 88 insertions, 73 deletions
diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html new file mode 100755 index 0000000000..399c978898 --- /dev/null +++ b/phpBB/styles/prosilver/template/captcha_default.html @@ -0,0 +1,9 @@ + + <dl> + <dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt> + <dd><img src="{CONFIRM_IMAGE}" alt="" /></dd> + <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" class="inputbox narrow" title="{L_CONFIRM_CODE}" /> + <!-- IF S_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --> + <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd> + <dd>{L_CONFIRM_CODE_EXPLAIN}</dd> + </dl>
\ No newline at end of file diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html new file mode 100644 index 0000000000..f325c3727d --- /dev/null +++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html @@ -0,0 +1,19 @@ +<!-- IF S_RECAPTCHA_AVAILABLE --> + <dl> + <script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"> + // <![CDATA[ + var RecaptchaOptions = { + lang : {L_RECAPTCHA_LANG} + }; + // ]]> + </script> + + <noscript> + <iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br/> + <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea> + <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/> + </noscript> + </dl> +<!-- ELSE --> +{L_RECAPTCHA_NOT_AVAILABLE} +<!-- ENDIF -->
\ No newline at end of file diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html index ac7ada28c9..a32c2d1e42 100644 --- a/phpBB/styles/prosilver/template/login_body.html +++ b/phpBB/styles/prosilver/template/login_body.html @@ -21,21 +21,16 @@ <!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF --> <!-- ENDIF --> </dl> - <!-- IF S_CONFIRM_CODE --> - <dl> - <dt><label for="confirm_code">{L_CONFIRM_CODE}:</label><br /><span>{L_CONFIRM_CODE_EXPLAIN}</span></dt> - <dd><input type="hidden" name="confirm_id" value="{CONFIRM_ID}" />{CONFIRM_IMAGE}</dd> - <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="3" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd> - </dl> + {CONFIRM} <!-- ENDIF --> - <!-- IF S_DISPLAY_FULL_LOGIN --> <dl> <!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF --> <dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label></dd> </dl> <!-- ENDIF --> + <dl> <dt> </dt> <dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd> @@ -46,6 +41,7 @@ <span class="corners-bottom"><span></span></span></div> </div> + <!-- IF not S_ADMIN_AUTH and S_REGISTER_ENABLED --> <div class="panel"> <div class="inner"><span class="corners-top"><span></span></span> diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 248d1ea72c..315fbaee2b 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -100,11 +100,7 @@ <dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd> </dl> <!-- IF S_CONFIRM_CODE --> - <dl> - <dt><label for="confirm_code">{L_CONFIRM_CODE}:</label><br /><span>{L_CONFIRM_CODE_EXPLAIN}</span></dt> - <dd><input type="hidden" name="confirm_id" value="{CONFIRM_ID}" />{CONFIRM_IMAGE}</dd> - <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="3" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd> - </dl> + {CONFIRM} <!-- ENDIF --> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 3aeb92a5b0..468b131c4b 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -71,8 +71,7 @@ </dl> <!-- END profile_fields --> </fieldset> - -<!-- IF S_CONFIRM_CODE --> +<!-- IF S_CAPTCHA --> <span class="corners-bottom"><span></span></span></div> </div> @@ -83,16 +82,11 @@ <p>{L_CONFIRM_EXPLAIN}</p> <fieldset class="fields2"> - <dl> - <dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt> - <dd>{CONFIRM_IMG}</dd> - <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd> - <dd>{L_CONFIRM_CODE_EXPLAIN}<!-- IF S_CONFIRM_REFRESH --> {L_VC_REFRESH_EXPLAIN}<!-- ENDIF --></dd> - <!-- IF S_CONFIRM_REFRESH --><dd><input type="submit" value="{L_VC_REFRESH}" class="button2" /></dd> <!-- ENDIF --> - </dl> + {S_CAPTCHA} + </fieldset> -<!-- ENDIF --> +<!-- ENDIF --> <!-- IF S_COPPA --> <span class="corners-bottom"><span></span></span></div> </div> diff --git a/phpBB/styles/subsilver2/template/captcha_default.html b/phpBB/styles/subsilver2/template/captcha_default.html new file mode 100755 index 0000000000..a1bc6cd6dc --- /dev/null +++ b/phpBB/styles/subsilver2/template/captcha_default.html @@ -0,0 +1,19 @@ + <tr> + <th colspan="2" valign="middle">{L_CONFIRM_CODE}</th> + </tr> + <tr> + <td class="row3" colspan="2"><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td> + </tr> + <tr> + <td class="row1" colspan="2" align="center"><img src="{CONFIRM_IMAGE}" alt="{L_CONFIRM_CODE}" /> + <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd> +</td> + </tr> + <tr> + <td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN} +</span></td> + <td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" /> + <!-- IF S_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --></td> + </tr> + + diff --git a/phpBB/styles/subsilver2/template/captcha_recaptcha.html b/phpBB/styles/subsilver2/template/captcha_recaptcha.html new file mode 100755 index 0000000000..106a5cce2a --- /dev/null +++ b/phpBB/styles/subsilver2/template/captcha_recaptcha.html @@ -0,0 +1,21 @@ +<!-- IF S_RECAPTCHA_AVAILABLE --> + <tr><td colspan="22> + <script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"> + // <![CDATA[ + var RecaptchaOptions = { + lang : {L_RECAPTCHA_LANG} + }; + // ]]> + </script> + + <noscript> + <iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br/> + <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea> + <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/> + </noscript></td></tr> + +<!-- ELSE --> +{L_RECAPTCHA_NOT_AVAILABLE} +<!-- ENDIF --> + +
\ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html index 86eed2dfc6..406ab3a293 100644 --- a/phpBB/styles/subsilver2/template/login_body.html +++ b/phpBB/styles/subsilver2/template/login_body.html @@ -65,26 +65,13 @@ </td> </tr> -<!-- IF S_CONFIRM_CODE --> +<!-- IF S_CAPTCHA --> </table> <table class="tablebg" width="100%" cellspacing="1"> - <tr> - <th colspan="2" valign="middle">{L_LOGIN_CONFIRMATION}</th> - </tr> - <tr> - <td class="row3" colspan="2"><span class="gensmall">{L_LOGIN_CONFIRM_EXPLAIN}</span></td> - </tr> - <tr> - <td class="row1" colspan="2" align="center"> - <input type="hidden" name="confirm_id" value="{CONFIRM_ID}" /> - {CONFIRM_IMAGE} - </td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td> - <td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" /></td> - </tr> -<!-- ENDIF --> + + {S_CAPTCHA} + <!-- ENDIF --> + <tr> <td class="cat" <!-- IF not S_ADMIN_AUTH or S_CONFIRM_CODE -->colspan="2"<!-- ENDIF --> align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="5" /></td> </tr> diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index da1fbf4e30..162227b7e5 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -332,24 +332,10 @@ </tr> <!-- ENDIF --> -<!-- IF S_CONFIRM_CODE --> - <tr> - <th colspan="2" valign="middle">{L_POST_CONFIRMATION}</th> - </tr> - <tr> - <td class="row3" colspan="2"><span class="gensmall">{L_POST_CONFIRM_EXPLAIN}</span></td> - </tr> - <tr> - <td class="row1" colspan="2" align="center"> - <input type="hidden" name="confirm_id" value="{CONFIRM_ID}" /> - {CONFIRM_IMAGE} - </td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td> - <td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" /></td> - </tr> -<!-- ENDIF --> + <!-- IF S_CAPTCHA --> + {S_CAPTCHA} + <!-- ENDIF --> + <!-- IF S_SHOW_ATTACH_BOX or S_SHOW_POLL_BOX --> <tr> diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html index fd987f2d73..dc47323836 100644 --- a/phpBB/styles/subsilver2/template/ucp_register.html +++ b/phpBB/styles/subsilver2/template/ucp_register.html @@ -77,21 +77,9 @@ </tr> <!-- END profile_fields --> -<!-- IF S_CONFIRM_CODE --> - <tr> - <th colspan="2" valign="middle">{L_CONFIRMATION}</th> - </tr> - <tr> - <td class="row3" colspan="2"><span class="gensmall">{L_CONFIRM_EXPLAIN}</span></td> - </tr> - <tr> - <td class="row1" colspan="2" align="center">{CONFIRM_IMG}</td> - </tr> - <tr> - <td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN} <!-- IF S_CONFIRM_REFRESH -->{L_VC_REFRESH_EXPLAIN}<!-- ENDIF --></span></td> - <td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" /><!-- IF S_CONFIRM_REFRESH --> <input type="submit" value="{L_VC_REFRESH}" class="btnlite" /><!-- ENDIF --></td> - </tr> -<!-- ENDIF --> + <!-- IF S_CAPTCHA --> + {S_CAPTCHA} + <!-- ENDIF --> <!-- IF S_COPPA --> <tr> |