diff options
Diffstat (limited to 'phpBB/adm')
33 files changed, 94 insertions, 105 deletions
diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 42ae610545..dd1374fee4 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -109,8 +109,8 @@ <!-- ELSE --> <p>{L_NO_IPS_DEFINED}</p> <!-- ENDIF --> - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <!-- ELSEIF S_EXTENSION_GROUPS --> @@ -214,9 +214,9 @@ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </p> - - </fieldset> {S_FORM_TOKEN} + </fieldset> + </form> <!-- ELSE --> @@ -257,8 +257,8 @@ {L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" /> <input class="button2" name="add" type="submit" value="{L_SUBMIT}" /> </p> - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <!-- ENDIF --> @@ -280,8 +280,8 @@ <p class="quick"> <input type="submit" id="add_extension_check" name="add_extension_check" class="button2" value="{L_SUBMIT}" /> </p> - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <br /> @@ -320,8 +320,8 @@ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </p> - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <!-- ELSEIF S_ORPHAN --> @@ -367,9 +367,8 @@ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </p> - - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index d8638f5bcd..85b8acc393 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -71,9 +71,8 @@ <input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" /> </p> - -</fieldset> {S_FORM_TOKEN} +</fieldset> </form> <br /><br /> @@ -109,15 +108,17 @@ <input class="button1" type="submit" id="unbansubmit" name="unbansubmit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="unbanreset" name="unbanreset" value="{L_RESET}" /> </p> + {S_FORM_TOKEN} </fieldset> <!-- ELSE --> <p>{L_NO_BAN_CELL}</p> + {S_FORM_TOKEN} </fieldset> <!-- ENDIF --> -{S_FORM_TOKEN} + </form> diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index 48b117cfc9..a0b0016a11 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -51,6 +51,7 @@ <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + {S_FORM_TOKEN} </fieldset> <br /> @@ -77,7 +78,6 @@ <!-- END token --> </tbody> </table> - {S_FORM_TOKEN} </form> <!-- ELSE --> @@ -110,8 +110,9 @@ <p class="quick"> <input class="button2" name="submit" type="submit" value="{L_ADD_BBCODE}" /> </p> + {S_FORM_TOKEN} </fieldset> -{S_FORM_TOKEN} + </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index 2569b162ca..bb16204801 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -42,10 +42,8 @@ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </p> - + {S_FORM_TOKEN} </fieldset> - -{S_FORM_TOKEN} </form> <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index 92778472d8..7783356574 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -49,9 +49,9 @@ <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + {S_FORM_TOKEN} </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSE --> @@ -93,8 +93,8 @@ <select name="action">{S_BOT_OPTIONS}</select> <input class="button2" name="submit" type="submit" value="{L_SUBMIT}" /> <p class="small"><a href="#" onclick="marklist('acp_bots', 'mark', true);">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('acp_bots', 'mark', false);">{L_UNMARK_ALL}</a></p> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index ecb60e4b59..d9d087d6ba 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -63,8 +63,8 @@ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> <input class="button2" type="submit" id="preview" name="preview" value="{L_PREVIEW}" /> + {S_FORM_TOKEN} </fieldset> -{S_FORM_TOKEN} </form> <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index dc24b55bb1..8165efe9a2 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -23,9 +23,8 @@ <input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" /> </p> <!-- ENDIF --> - + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSE --> @@ -85,8 +84,8 @@ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </p> - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html index 020135e227..b68d3ab3c0 100644 --- a/phpBB/adm/style/acp_disallow.html +++ b/phpBB/adm/style/acp_disallow.html @@ -38,8 +38,8 @@ <!-- ELSE --> <p>{L_NO_DISALLOWED}</p> <!-- ENDIF --> + {S_FORM_TOKEN} </fieldset> -{S_FORM_TOKEN} </form> <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index bb891de0b4..b1d9b4af11 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -47,8 +47,8 @@ <input class="button1" type="submit" id="submit" name="submit" value="{L_EMAIL}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </p> -</fieldset> {S_FORM_TOKEN} +</fieldset> </form> <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 91c15999e5..560bc195bc 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -317,8 +317,8 @@ <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSEIF S_DELETE_FORUM --> @@ -366,8 +366,8 @@ <p class="quick"> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> </p> - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <!-- ELSEIF S_CONTINUE_SYNC --> @@ -475,8 +475,8 @@ {L_SELECT_FORUM}: <select name="parent_id" onchange="if(this.options[this.selectedIndex].value != -1){ this.form.submit(); }">{FORUM_BOX}</select> <input class="button2" type="submit" value="{L_GO}" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <form id="forums" method="post" action="{U_ACTION}"> @@ -486,8 +486,8 @@ <input type="text" name="forum_name" value="" maxlength="255" /> <input class="button2" name="addforum" type="submit" value="{L_CREATE_FORUM}" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index b615099b7c..c90a075f9e 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -154,8 +154,8 @@ <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSEIF S_LIST --> @@ -260,8 +260,8 @@ <p class="quick"> <input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" /> </p> - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <!-- ELSE --> @@ -309,8 +309,8 @@ {L_CREATE_GROUP}: <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" /> <input type="hidden" name="add" value="1" /> <!-- ENDIF --> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <h1>{L_SPECIAL_GROUPS}</h1> diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index e02840f1c5..8bb8257318 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -158,9 +158,8 @@ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </p> - - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <!-- ELSEIF S_CHOOSE_PAK --> @@ -194,8 +193,8 @@ <input class="button1" type="submit" id="import" name="import" value="{L_IMPORT_SUBMIT}" /> </p> <!-- ENDIF --> - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <!-- ELSE --> @@ -256,8 +255,8 @@ <p class="quick"> <input class="button2" name="add" type="submit" value="{L_ICON_ADD}" /> <input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" /> </p> - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index b5a05ec799..240cec1643 100755 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -60,12 +60,12 @@ <fieldset class="quick"> <select name="action">{S_INACTIVE_OPTIONS}</select> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" /> -<p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p> + <p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p> + {S_FORM_TOKEN} </fieldset> -{S_FORM_TOKEN} </form> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index b57ad59af5..2cc715493a 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -58,8 +58,8 @@ <fieldset class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + {S_FORM_TOKEN} </fieldset> -{S_FORM_TOKEN} </form> <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index a6f99c2b56..815ebb024a 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -54,8 +54,8 @@ <p class="quick" style="margin-top: -15px;"> <input type="submit" name="update_details" class="button2" value="{L_SUBMIT}" /> </p> - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <br /><br /> @@ -92,7 +92,7 @@ <!-- END missing --> </tbody> </table> - {S_FORM_TOKEN} + <div>{S_FORM_TOKEN}</div> </form> <br /><br /> @@ -157,11 +157,10 @@ {TPL} <!-- ENDIF --> <tr> - <td class="row3" colspan="3" style="text-align: right;"><input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" /> <input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td> + <td class="row3" colspan="3" style="text-align: right;">{S_FORM_TOKEN}<input type="submit" name="download_file" class="button2" value="{L_SUBMIT_AND_DOWNLOAD}" /> <input type="submit" name="submit_file" class="button2" value="{L_SUBMIT}" /></td> </tr> </tbody> </table> - {S_FORM_TOKEN} </form> <!-- ELSEIF S_UPLOAD --> @@ -198,10 +197,10 @@ <fieldset class="quick"> {HIDDEN} + {S_FORM_TOKEN} <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> <input class="button1" type="submit" name="test_connection" value="{L_TEST_CONNECTION}" /> </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSE --> diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index cc1765e2a4..11ab5faa9c 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -56,6 +56,7 @@ <fieldset class="display-options"> {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} <input class="button2" type="submit" value="{L_GO}" name="sort" /> + {S_FORM_TOKEN} </fieldset> <hr /> <!-- IF PAGINATION --> @@ -79,7 +80,6 @@ <!-- ENDIF --> -{S_FORM_TOKEN} </form> <!-- INCLUDE overall_footer.html -->
\ No newline at end of file diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 729ac56c5e..5396e78557 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -115,8 +115,8 @@ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </p> - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <!-- ELSE --> diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index f6ca6081aa..725c7a5ec1 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -124,8 +124,8 @@ <fieldset class="quick"> <input type="submit" class="button1" name="submit" value="{L_SUBMIT}" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <a href="#maincontent">» {L_BACK_TO_TOP}</a><br /> @@ -178,8 +178,8 @@ <fieldset class="quick"> {L_CREATE_ROLE}: <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- IF S_DISPLAY_ROLE_MASK --> diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index a4797fcc4f..b4386d5f19 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -35,11 +35,11 @@ <p class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- IF S_FORUM_MULTIPLE --> @@ -56,11 +56,11 @@ <p class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- ENDIF --> @@ -80,10 +80,10 @@ <p class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSEIF S_SELECT_GROUP and S_CAN_SELECT_GROUP --> @@ -99,11 +99,11 @@ <p class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSEIF S_SELECT_USERGROUP --> @@ -126,9 +126,9 @@ <fieldset class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input type="submit" class="button2" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" /> </fieldset> - {S_FORM_TOKEN} </form> <form id="add_user" method="post" action="{U_ACTION}"> @@ -144,9 +144,9 @@ <fieldset class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input class="button1" type="submit" name="submit_add_options" value="{L_ADD_PERMISSIONS}" /> </fieldset> - {S_FORM_TOKEN} </form> <!-- ENDIF --> @@ -171,9 +171,9 @@ <fieldset class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input class="button2" type="submit" name="action[delete]" value="{L_REMOVE_PERMISSIONS}" style="width: 46% !important;" /> <input class="button1" type="submit" name="submit_edit_options" value="{L_EDIT_PERMISSIONS}" style="width: 46% !important;" /> </fieldset> - {S_FORM_TOKEN} </form> <form id="add_groups" method="post" action="{U_ACTION}"> @@ -187,10 +187,9 @@ <fieldset class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input type="submit" class="button1" name="submit_add_options" value="{L_ADD_PERMISSIONS}" /> </fieldset> - - {S_FORM_TOKEN} </form> <!-- ENDIF --> @@ -214,10 +213,9 @@ <fieldset class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" /> </fieldset> - - {S_FORM_TOKEN} </form> <form id="add_user" method="post" action="{U_ACTION}"> @@ -234,9 +232,9 @@ <fieldset class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" /> </fieldset> - {S_FORM_TOKEN} </form> </div> @@ -256,10 +254,9 @@ <fieldset class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input class="button1" type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" /> </fieldset> - - {S_FORM_TOKEN} </form> <form id="group" method="post" action="{U_ACTION}"> @@ -275,10 +272,9 @@ <fieldset class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input type="submit" name="submit" value="{L_VIEW_PERMISSIONS}" class="button1" /> </fieldset> - - {S_FORM_TOKEN} </form> </div> @@ -318,11 +314,11 @@ <fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} {L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select> <input class="button2" type="submit" name="submit" value="{L_GO}" /> </fieldset> - {S_FORM_TOKEN} </form> <!-- ENDIF --> @@ -347,11 +343,11 @@ <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> <input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" /> <input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" /> + {S_FORM_TOKEN} </fieldset> <br /><br /> - {S_FORM_TOKEN} </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 912e58b43c..eec975ad25 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -108,6 +108,7 @@ <fieldset class="quick"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input class="button1" type="submit" name="next" value="{L_PROFILE_TYPE_OPTIONS}" /> </fieldset> @@ -129,6 +130,7 @@ <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input class="button1" type="submit" name="next" value="{L_NEXT_STEP}" /> </fieldset> @@ -153,10 +155,11 @@ <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> {S_HIDDEN_FIELDS} <input class="button1" type="submit" name="save" value="{L_SAVE}" /> + {S_FORM_TOKEN} </fieldset> <!-- ENDIF --> - {S_FORM_TOKEN} + </form> <!-- ELSE --> @@ -216,8 +219,8 @@ <input class="text small" type="text" name="field_ident" /> <select name="field_type">{S_TYPE_OPTIONS}</select> <input class="button1" type="submit" name="submit" value="{L_CREATE_NEW_FIELD}" /> <input type="hidden" name="create" value="1" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index 14a367ce27..890a3ba569 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -97,11 +97,10 @@ <p class="quick"> {S_HIDDEN_FIELDS} - + {S_FORM_TOKEN} <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 7d84146267..0f2b23dcef 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -51,9 +51,9 @@ <input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + {S_FORM_TOKEN} </p> </fieldset> -{S_FORM_TOKEN} </form> <!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index 482fbcb02c..9306e30269 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -50,9 +50,9 @@ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + {S_FORM_TOKEN} </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSE --> @@ -88,9 +88,9 @@ <p class="quick"> <input class="button2" name="add" type="submit" value="{L_ADD_RANK}" /> + {S_FORM_TOKEN} </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index 221a776a24..23fcfbdeb8 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -52,9 +52,9 @@ <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + {S_FORM_TOKEN} </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSE --> @@ -116,10 +116,10 @@ <input type="text" name="reason_title" /> <input class="button2" name="addreason" type="submit" value="{L_ADD_NEW_REASON}" /> + {S_FORM_TOKEN} </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index d4937c6ecc..0879780749 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -59,9 +59,8 @@ <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + {S_FORM_TOKEN} </fieldset> - - {S_FORM_TOKEN} </form> <!-- ELSEIF S_INDEX --> @@ -90,8 +89,8 @@ <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" id="continue" name="continue" value="{L_CONTINUE}" onclick="popup_progress_bar('{S_CONTINUE_INDEXING}');" /> <input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSE --> @@ -141,8 +140,9 @@ <input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" /> <!-- ENDIF --> </p> - </fieldset> {S_FORM_TOKEN} + </fieldset> + </form> <!-- END backend --> diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index a067e1a16b..4b3bcddf1d 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -25,9 +25,9 @@ <p class="quick"> <input class="button1" type="submit" name="update" value="{L_DELETE}" /> + {S_FORM_TOKEN} </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSEIF S_EDIT_IMAGESET --> @@ -147,8 +147,8 @@ <fieldset class="submit-buttons"> <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> <input class="button2" type="reset" value="{L_RESET}" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSEIF S_EDIT_TEMPLATE or S_EDIT_THEME --> @@ -170,10 +170,9 @@ <dt><label for="template_file">{L_FILE}:</label></dt> <dd><select id="template_file" name="template_file" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_TEMPLATES}</select> <input class="button2" type="submit" value="{L_SELECT}" /></dd> </dl> + {S_FORM_TOKEN} </fieldset> <!-- ENDIF --> - - {S_FORM_TOKEN} </form> <!-- IF TEMPLATE_FILE or (S_EDIT_THEME and S_THEME_IN_DB) --> @@ -253,10 +252,9 @@ <fieldset class="submit-buttons"> <legend>{L_SUBMIT}</legend> {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} <input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" /> </fieldset> - - {S_FORM_TOKEN} </form> <!-- ENDIF --> @@ -301,12 +299,10 @@ <p class="quick"> <span class="small"><a href="#" onclick="marklist('acp_styles', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('acp_styles', 'delete', false); return false;">{L_UNMARK_ALL}</a></span><br /> - + {S_FORM_TOKEN} <input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" /> </p> </fieldset> - - {S_FORM_TOKEN} </form> <!-- ELSEIF S_EXPORT --> @@ -360,11 +356,12 @@ </dl> <p class="quick"> + {S_FORM_TOKEN} <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> </p> </fieldset> - {S_FORM_TOKEN} + </form> <!-- ELSEIF S_FRONTEND --> @@ -508,9 +505,9 @@ <fieldset class="submit-buttons"> <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 593889e7d1..2e4b3ef8f2 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -46,8 +46,8 @@ <fieldset class="quick"> <input type="submit" name="update" value="{L_SUBMIT}" class="button1" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSE --> @@ -69,8 +69,8 @@ <fieldset class="quick"> {L_SELECT_FORM}: <select name="mode" onchange="if (this.options[this.selectedIndex].value != '') this.form.submit();">{S_FORM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ENDIF --> @@ -109,8 +109,8 @@ <fieldset class="quick"> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSEIF S_SIGNATURE --> @@ -143,9 +143,9 @@ <!-- IF S_GROUP_OPTIONS --> <fieldset class="quick"> {L_USER_GROUP_ADD}: <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> + {S_FORM_TOKEN} </fieldset> <!-- ENDIF --> - {S_FORM_TOKEN} </form> <!-- ELSEIF S_ATTACHMENTS --> @@ -201,8 +201,8 @@ <fieldset class="quick"> <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /> <p class="small"><a href="#" onclick="marklist('user_attachments', 'mark', true);">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('user_attachments', 'mark', false);">{L_UNMARK_ALL}</a></p> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSEIF S_PERMISSIONS --> @@ -217,8 +217,8 @@ <fieldset class="quick" style="text-align: left;"> {L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select> <input class="button2" type="submit" value="{L_GO}" name="select" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form> <div class="clearfix"> </div> diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 2b5745ebb6..20b5b60050 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -70,7 +70,7 @@ <fieldset class="quick"> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form>
\ No newline at end of file diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index da699968c5..0611ccba46 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -61,10 +61,10 @@ <p class="quick"> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> <input type="hidden" name="action" value="" /> + {S_FORM_TOKEN} </p> </fieldset> -{S_FORM_TOKEN} </form> <!-- IF not S_USER_FOUNDER or S_FOUNDER --> @@ -134,11 +134,11 @@ <p class="quick"> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> + {S_FORM_TOKEN} </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index b8b847bd14..07a9bc5c78 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -152,7 +152,7 @@ <fieldset class="quick"> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> + {S_FORM_TOKEN} </fieldset> - {S_FORM_TOKEN} </form>
\ No newline at end of file diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html index 959494f5e3..0d1c6f8e46 100644 --- a/phpBB/adm/style/acp_users_profile.html +++ b/phpBB/adm/style/acp_users_profile.html @@ -61,7 +61,6 @@ <fieldset class="quick"> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> + {S_FORM_TOKEN} </fieldset> - - {S_FORM_TOKEN} </form>
\ No newline at end of file diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index 3b6303319b..a6664a40e4 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -112,6 +112,6 @@ <fieldset class="submit-buttons"> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> <input class="button2" type="submit" name="preview" value="{L_PREVIEW}" /> + {S_FORM_TOKEN} </fieldset> -{S_FORM_TOKEN} </form>
\ No newline at end of file diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index 3f99637418..9bd0bf11a0 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -27,9 +27,9 @@ <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="save" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + {S_FORM_TOKEN} </p> </fieldset> - {S_FORM_TOKEN} </form> <!-- ELSE --> @@ -65,9 +65,8 @@ <!-- END words --> </tbody> </table> - - </fieldset> {S_FORM_TOKEN} + </fieldset> </form> <!-- ENDIF --> |