From 4defd8a8306fa8daa25427a37fb6db00bff390c7 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Wed, 3 Oct 2007 15:05:54 +0000
Subject: Ok, here comes a big one. Poor updater. Also requires testing.

#i91
#i92
#i93
#i94
#i95
#i96


git-svn-id: file:///svn/phpbb/trunk@8120 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/styles/subsilver2/template/index_body.html            | 2 +-
 phpBB/styles/subsilver2/template/login_body.html            | 1 +
 phpBB/styles/subsilver2/template/login_forum.html           | 2 +-
 phpBB/styles/subsilver2/template/mcp_approve.html           | 1 +
 phpBB/styles/subsilver2/template/mcp_ban.html               | 2 +-
 phpBB/styles/subsilver2/template/mcp_forum.html             | 2 +-
 phpBB/styles/subsilver2/template/mcp_front.html             | 2 +-
 phpBB/styles/subsilver2/template/mcp_logs.html              | 2 +-
 phpBB/styles/subsilver2/template/mcp_move.html              | 2 +-
 phpBB/styles/subsilver2/template/mcp_notes_front.html       | 2 +-
 phpBB/styles/subsilver2/template/mcp_notes_user.html        | 2 +-
 phpBB/styles/subsilver2/template/mcp_post.html              | 5 +++--
 phpBB/styles/subsilver2/template/mcp_queue.html             | 2 +-
 phpBB/styles/subsilver2/template/mcp_reports.html           | 2 +-
 phpBB/styles/subsilver2/template/mcp_topic.html             | 1 +
 phpBB/styles/subsilver2/template/mcp_viewlogs.html          | 2 +-
 phpBB/styles/subsilver2/template/mcp_warn_front.html        | 2 +-
 phpBB/styles/subsilver2/template/mcp_warn_list.html         | 2 +-
 phpBB/styles/subsilver2/template/mcp_warn_post.html         | 1 +
 phpBB/styles/subsilver2/template/mcp_warn_user.html         | 1 +
 phpBB/styles/subsilver2/template/memberlist_body.html       | 2 ++
 phpBB/styles/subsilver2/template/memberlist_email.html      | 2 ++
 phpBB/styles/subsilver2/template/memberlist_im.html         | 1 +
 phpBB/styles/subsilver2/template/memberlist_search.html     | 2 +-
 phpBB/styles/subsilver2/template/posting_body.html          | 2 +-
 phpBB/styles/subsilver2/template/report_body.html           | 1 +
 phpBB/styles/subsilver2/template/ucp_agreement.html         | 1 +
 phpBB/styles/subsilver2/template/ucp_footer.html            | 4 ++--
 phpBB/styles/subsilver2/template/ucp_pm_message_footer.html | 4 ++++
 phpBB/styles/subsilver2/template/ucp_pm_options.html        | 1 +
 phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html     | 1 +
 phpBB/styles/subsilver2/template/ucp_register.html          | 2 +-
 phpBB/styles/subsilver2/template/ucp_remind.html            | 2 +-
 phpBB/styles/subsilver2/template/ucp_resend.html            | 1 +
 34 files changed, 42 insertions(+), 22 deletions(-)

(limited to 'phpBB/styles/subsilver2/template')

diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html
index 3ec8bac1fb..3958743229 100644
--- a/phpBB/styles/subsilver2/template/index_body.html
+++ b/phpBB/styles/subsilver2/template/index_body.html
@@ -78,7 +78,7 @@
 		<td class="row1" align="center"><span class="genmed">{L_USERNAME}:</span> <input class="post" type="text" name="username" size="10" />&nbsp; <span class="genmed">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" />&nbsp; <!-- IF S_AUTOLOGIN_ENABLED --> <span class="gensmall">{L_LOG_ME_IN}</span> <input type="checkbox" class="radio" name="autologin" /><!-- ENDIF -->&nbsp; <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td>
 	</tr>
 	</table>
-	
+	{S_FORM_TOKEN}
 	</form>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html
index 2462914756..bc66ece6d4 100644
--- a/phpBB/styles/subsilver2/template/login_body.html
+++ b/phpBB/styles/subsilver2/template/login_body.html
@@ -89,6 +89,7 @@
 	<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>
 </table>
+{S_FORM_TOKEN}
 
 </form>
 
diff --git a/phpBB/styles/subsilver2/template/login_forum.html b/phpBB/styles/subsilver2/template/login_forum.html
index 0ede67154e..c3d57085df 100644
--- a/phpBB/styles/subsilver2/template/login_forum.html
+++ b/phpBB/styles/subsilver2/template/login_forum.html
@@ -31,7 +31,7 @@
 		<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="3" /></td>
 	</tr>
 	</table>
-	
+	{S_FORM_TOKEN}
 	</form>
 
 </div>
diff --git a/phpBB/styles/subsilver2/template/mcp_approve.html b/phpBB/styles/subsilver2/template/mcp_approve.html
index 22b89cff47..2d2013f05c 100644
--- a/phpBB/styles/subsilver2/template/mcp_approve.html
+++ b/phpBB/styles/subsilver2/template/mcp_approve.html
@@ -35,6 +35,7 @@
 		</td>
 	</tr>
 	</table>
+	{S_FORM_TOKEN}
 	</form>
 	
 </div>
diff --git a/phpBB/styles/subsilver2/template/mcp_ban.html b/phpBB/styles/subsilver2/template/mcp_ban.html
index 442b6ee4db..04f90530c9 100644
--- a/phpBB/styles/subsilver2/template/mcp_ban.html
+++ b/phpBB/styles/subsilver2/template/mcp_ban.html
@@ -103,7 +103,7 @@
 	</tr>
 <!-- ENDIF -->
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <!-- INCLUDE mcp_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subsilver2/template/mcp_forum.html b/phpBB/styles/subsilver2/template/mcp_forum.html
index cf7fe7fee3..956d253aa6 100644
--- a/phpBB/styles/subsilver2/template/mcp_forum.html
+++ b/phpBB/styles/subsilver2/template/mcp_forum.html
@@ -73,7 +73,7 @@
 	</td>
 </tr>
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
diff --git a/phpBB/styles/subsilver2/template/mcp_front.html b/phpBB/styles/subsilver2/template/mcp_front.html
index e42c29471a..122f5283ae 100644
--- a/phpBB/styles/subsilver2/template/mcp_front.html
+++ b/phpBB/styles/subsilver2/template/mcp_front.html
@@ -38,7 +38,7 @@
 		<td class="cat" colspan="6" align="center"><input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" />&nbsp;&nbsp;<input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /></td>
 	</tr>
 	</table>
-	
+	{S_FORM_TOKEN}
 	</form>
 	
 	<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
diff --git a/phpBB/styles/subsilver2/template/mcp_logs.html b/phpBB/styles/subsilver2/template/mcp_logs.html
index e163cf35d0..f7c4a99fc1 100644
--- a/phpBB/styles/subsilver2/template/mcp_logs.html
+++ b/phpBB/styles/subsilver2/template/mcp_logs.html
@@ -35,7 +35,7 @@
 	</tr>
 <!-- ENDIF -->
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <br clear="all" /><br />
diff --git a/phpBB/styles/subsilver2/template/mcp_move.html b/phpBB/styles/subsilver2/template/mcp_move.html
index 6e2356044f..db7a6e7241 100644
--- a/phpBB/styles/subsilver2/template/mcp_move.html
+++ b/phpBB/styles/subsilver2/template/mcp_move.html
@@ -29,7 +29,7 @@
 		</td>
 	</tr>
 	</table>
-	
+	{S_FORM_TOKEN}	
 	</form>
 	
 </div>
diff --git a/phpBB/styles/subsilver2/template/mcp_notes_front.html b/phpBB/styles/subsilver2/template/mcp_notes_front.html
index a805be6749..17f389f7f3 100644
--- a/phpBB/styles/subsilver2/template/mcp_notes_front.html
+++ b/phpBB/styles/subsilver2/template/mcp_notes_front.html
@@ -14,7 +14,7 @@
 	<td class="cat" colspan="2" align="center"><input type="submit" name="submituser" value="{L_SUBMIT}" class="btnmain" /></td>
 </tr>
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <br clear="all" /><br />
diff --git a/phpBB/styles/subsilver2/template/mcp_notes_user.html b/phpBB/styles/subsilver2/template/mcp_notes_user.html
index 895c0d35e6..80ac96edf2 100644
--- a/phpBB/styles/subsilver2/template/mcp_notes_user.html
+++ b/phpBB/styles/subsilver2/template/mcp_notes_user.html
@@ -114,7 +114,7 @@
 	<td align="{S_CONTENT_FLOW_END}"><span class="pagination"><!-- INCLUDE pagination.html --></span></td>
 </tr>
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <br clear="all" /><br />
diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html
index ad3e0df07c..36f7eefe04 100644
--- a/phpBB/styles/subsilver2/template/mcp_post.html
+++ b/phpBB/styles/subsilver2/template/mcp_post.html
@@ -33,6 +33,7 @@
 	</table>
 
 	<input type="hidden" name="report_id_list[]" value="{REPORT_ID}" />
+	{S_FORM_TOKEN}
 	</form>
 
 	<br clear="all"/>
@@ -104,7 +105,7 @@
 	<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
 <!-- ENDIF -->
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <!-- IF S_MCP_QUEUE -->
@@ -132,7 +133,7 @@
 		<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST -->
 			<tr>
 				<td class="row1" valign="top"><b class="gen">{L_MOD_OPTIONS}</b></td>
-				<td class="row2"><form method="post" name="mcp" action="{U_MCP_ACTION}"><select name="action"><!-- IF S_CAN_LOCK_POST --><!-- IF S_POST_LOCKED --><option value="unlock_post">{L_UNLOCK_POST} [{L_UNLOCK_POST_EXPLAIN}]</option><!-- ELSE --><option value="lock_post">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</option><!-- ENDIF --><!-- ENDIF --><!-- IF S_CAN_DELETE_POST --><option value="delete_post">{L_DELETE_POST}</option><!-- ENDIF --></select> <input class="btnmain" type="submit" value="{L_SUBMIT}" /></form></td>
+				<td class="row2"><form method="post" name="mcp" action="{U_MCP_ACTION}"><select name="action"><!-- IF S_CAN_LOCK_POST --><!-- IF S_POST_LOCKED --><option value="unlock_post">{L_UNLOCK_POST} [{L_UNLOCK_POST_EXPLAIN}]</option><!-- ELSE --><option value="lock_post">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</option><!-- ENDIF --><!-- ENDIF --><!-- IF S_CAN_DELETE_POST --><option value="delete_post">{L_DELETE_POST}</option><!-- ENDIF --></select> <input class="btnmain" type="submit" value="{L_SUBMIT}" />	{S_FORM_TOKEN}</form></td>
 			</tr>
 		<!-- ENDIF -->
 		</table>
diff --git a/phpBB/styles/subsilver2/template/mcp_queue.html b/phpBB/styles/subsilver2/template/mcp_queue.html
index 65c8adbbc8..4def047e51 100644
--- a/phpBB/styles/subsilver2/template/mcp_queue.html
+++ b/phpBB/styles/subsilver2/template/mcp_queue.html
@@ -34,7 +34,7 @@
 	<td class="cat" colspan="4" align="center"><input class="btnmain" type="submit" name="action[approve]" value="{L_APPROVE}" />&nbsp;&nbsp;<input class="btnlite" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" /></td>
 </tr>
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
diff --git a/phpBB/styles/subsilver2/template/mcp_reports.html b/phpBB/styles/subsilver2/template/mcp_reports.html
index 3b746c9932..72b26e8751 100644
--- a/phpBB/styles/subsilver2/template/mcp_reports.html
+++ b/phpBB/styles/subsilver2/template/mcp_reports.html
@@ -43,7 +43,7 @@
 	</td>
 </tr>
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html
index 456b1679e0..2b66c8702a 100644
--- a/phpBB/styles/subsilver2/template/mcp_topic.html
+++ b/phpBB/styles/subsilver2/template/mcp_topic.html
@@ -147,6 +147,7 @@
 </tr>
 </table>
 {S_HIDDEN_FIELDS}
+{S_FORM_TOKEN}
 </form>
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
diff --git a/phpBB/styles/subsilver2/template/mcp_viewlogs.html b/phpBB/styles/subsilver2/template/mcp_viewlogs.html
index 8f5a0753fb..b6431e4d51 100644
--- a/phpBB/styles/subsilver2/template/mcp_viewlogs.html
+++ b/phpBB/styles/subsilver2/template/mcp_viewlogs.html
@@ -39,7 +39,7 @@
 	</tr>
 <!-- END log -->
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_front.html b/phpBB/styles/subsilver2/template/mcp_warn_front.html
index fc127bc25c..78673b690e 100644
--- a/phpBB/styles/subsilver2/template/mcp_warn_front.html
+++ b/phpBB/styles/subsilver2/template/mcp_warn_front.html
@@ -14,7 +14,7 @@
 	<td class="cat" colspan="2" align="center"><input type="submit" name="submituser" value="{L_SUBMIT}" class="btnmain" /></td>
 </tr>
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <br clear="all" /><br />
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_list.html b/phpBB/styles/subsilver2/template/mcp_warn_list.html
index 9b1d6c13ac..078bbc0b34 100644
--- a/phpBB/styles/subsilver2/template/mcp_warn_list.html
+++ b/phpBB/styles/subsilver2/template/mcp_warn_list.html
@@ -35,7 +35,7 @@
 	<td align="{S_CONTENT_FLOW_END}"><span class="pagination"><!-- INCLUDE pagination.html --></span></td>
 </tr>
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <br clear="all" /><br />
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_post.html b/phpBB/styles/subsilver2/template/mcp_warn_post.html
index 957e9416d8..f12b1a4ba8 100644
--- a/phpBB/styles/subsilver2/template/mcp_warn_post.html
+++ b/phpBB/styles/subsilver2/template/mcp_warn_post.html
@@ -51,6 +51,7 @@
 	<td class="cat" align="center"><input class="btnmain" type="submit" name="action[add_warning]" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
 </tr>
 </table>
+{S_FORM_TOKEN}
 </form>
 
 <br clear="all" /><br />
diff --git a/phpBB/styles/subsilver2/template/mcp_warn_user.html b/phpBB/styles/subsilver2/template/mcp_warn_user.html
index 96ad4fb1a6..5e8c350935 100644
--- a/phpBB/styles/subsilver2/template/mcp_warn_user.html
+++ b/phpBB/styles/subsilver2/template/mcp_warn_user.html
@@ -65,6 +65,7 @@
 	<td class="cat" align="center"><input class="btnmain" type="submit" name="action[add_warning]" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
 </tr>
 </table>
+{S_FORM_TOKEN}
 </form>
 
 <br clear="all" /><br />
diff --git a/phpBB/styles/subsilver2/template/memberlist_body.html b/phpBB/styles/subsilver2/template/memberlist_body.html
index 836d0ce5df..cb7a7b20c7 100644
--- a/phpBB/styles/subsilver2/template/memberlist_body.html
+++ b/phpBB/styles/subsilver2/template/memberlist_body.html
@@ -22,6 +22,7 @@
 	<!-- ENDIF -->
 		</tr>
 		</table>
+		{S_FORM_TOKEN}
 	</form>
 <!-- ENDIF -->
 
@@ -88,6 +89,7 @@
 	<td class="cat" colspan="<!-- IF S_IN_SEARCH_POPUP -->9<!-- ELSE -->8<!-- ENDIF -->" align="center"><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input class="btnlite" type="submit" value="{L_SELECT_MARKED}" /><!-- ELSE --><span class="gensmall">{L_SELECT_SORT_METHOD}:</span>&nbsp;<select name="sk">{S_MODE_SELECT}</select>&nbsp; <span class="gensmall">{L_ORDER}</span>&nbsp;<select name="sd">{S_ORDER_SELECT}</select>&nbsp; <input type="submit" name="submit" value="{L_SUBMIT}" class="btnlite" /><!-- ENDIF --></td>
 </tr>
 </table>
+{S_FORM_TOKEN}
 	
 </form>
 
diff --git a/phpBB/styles/subsilver2/template/memberlist_email.html b/phpBB/styles/subsilver2/template/memberlist_email.html
index ba6c194fc9..976ac1ad89 100644
--- a/phpBB/styles/subsilver2/template/memberlist_email.html
+++ b/phpBB/styles/subsilver2/template/memberlist_email.html
@@ -55,6 +55,8 @@
 		<td class="cat" colspan="2" align="center"><input type="submit" tabindex="6" name="submit" class="btnmain" value="{L_SEND_EMAIL}" /></td>
 	</tr>
 	</table>
+
+	{S_FORM_TOKEN}
 	
 	</form>
 
diff --git a/phpBB/styles/subsilver2/template/memberlist_im.html b/phpBB/styles/subsilver2/template/memberlist_im.html
index 05c53808c6..acbe1fec2f 100644
--- a/phpBB/styles/subsilver2/template/memberlist_im.html
+++ b/phpBB/styles/subsilver2/template/memberlist_im.html
@@ -132,6 +132,7 @@
 
 	</table>
 	<a class="nav" href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
+{S_FORM_TOKEN}
 </form>
 
 
diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html
index c6e08dc815..f718c568ca 100644
--- a/phpBB/styles/subsilver2/template/memberlist_search.html
+++ b/phpBB/styles/subsilver2/template/memberlist_search.html
@@ -133,7 +133,7 @@
 	<td class="cat" colspan="4" align="center"><input class="btnlite" type="submit" name="submit" value="{L_SEARCH}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" /></td>
 </tr>
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html
index b94c972773..a1cd573768 100644
--- a/phpBB/styles/subsilver2/template/posting_body.html
+++ b/phpBB/styles/subsilver2/template/posting_body.html
@@ -397,7 +397,7 @@
 <!-- ELSE -->
 
 	<!-- INCLUDE breadcrumbs.html -->
-
+	{S_FORM_TOKEN}
 	</form>
 
 	<!-- IF S_DISPLAY_ONLINE_LIST -->
diff --git a/phpBB/styles/subsilver2/template/report_body.html b/phpBB/styles/subsilver2/template/report_body.html
index 83e33b4761..6861d28ce1 100644
--- a/phpBB/styles/subsilver2/template/report_body.html
+++ b/phpBB/styles/subsilver2/template/report_body.html
@@ -29,6 +29,7 @@
 	<td class="cat" colspan="2" align="center"><input type="submit" name="submit" class="btnmain" value="{L_SUBMIT}" />&nbsp;<input type="submit" name="cancel" class="btnlite" value="{L_CANCEL}" /></td>
 </tr>
 </table>
+{S_FORM_TOKEN}
 </form>
 
 <br clear="all" />
diff --git a/phpBB/styles/subsilver2/template/ucp_agreement.html b/phpBB/styles/subsilver2/template/ucp_agreement.html
index d01a040a7a..f695228d00 100644
--- a/phpBB/styles/subsilver2/template/ucp_agreement.html
+++ b/phpBB/styles/subsilver2/template/ucp_agreement.html
@@ -29,6 +29,7 @@
 	</tr>
 	</table>
 	{S_HIDDEN_FIELDS}
+	{S_FORM_TOKEN}
 	</form>
 	
 <!-- ELSEIF S_AGREEMENT -->
diff --git a/phpBB/styles/subsilver2/template/ucp_footer.html b/phpBB/styles/subsilver2/template/ucp_footer.html
index a6d1dec7a7..e7b84390c7 100644
--- a/phpBB/styles/subsilver2/template/ucp_footer.html
+++ b/phpBB/styles/subsilver2/template/ucp_footer.html
@@ -1,8 +1,8 @@
 
-	<!-- IF not S_PRIVMSGS or S_SHOW_DRAFTS --></form><!-- ENDIF --></td>
+	<!-- IF not S_PRIVMSGS or S_SHOW_DRAFTS -->	{S_FORM_TOKEN}</form><!-- ENDIF --></td>
 </tr>
 </table>
-<!-- IF S_SHOW_PM_BOX and S_POST_ACTION --></form><!-- ENDIF -->
+<!-- IF S_SHOW_PM_BOX and S_POST_ACTION -->{S_FORM_TOKEN}</form><!-- ENDIF -->
 
 <br clear="all" />
 
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html b/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html
index b65ab40129..36965bff5f 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html
@@ -1,5 +1,6 @@
 
 <!-- IF not S_VIEW_MESSAGE -->
+	{S_FORM_TOKEN}
 	</form>
 <!-- ENDIF -->
 
@@ -24,11 +25,14 @@
 							<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
 							<input type="hidden" name="p" value="{MSG_ID}" />
 							<select name="dest_folder">{S_TO_FOLDER_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" name="move_pm" value="{L_MOVE_TO_FOLDER}" />
+						{S_FORM_TOKEN}
+						{S_FORM_TOKEN}
 						</form>
 					<!-- ENDIF -->
 				<!-- ELSE -->
 					<form name="sortmsg" method="post" action="{S_PM_ACTION}" style="margin:0px">
 						<span class="gensmall">{L_DISPLAY_MESSAGES}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" />
+					{S_FORM_TOKEN}
 					</form>
 				<!-- ENDIF -->
 			</td>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_options.html b/phpBB/styles/subsilver2/template/ucp_pm_options.html
index 111dcc9e3c..3ff18d8c15 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_options.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_options.html
@@ -187,5 +187,6 @@
 	<td class="row1" colspan="2" align="{S_CONTENT_FLOW_END}"><input class="btnlite" style="width:150px" type="submit" name="fullfolder" value="{L_CHANGE}" /></td>
 </tr>
 </table>
+{S_FORM_TOKEN}
 </form>
 <!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html b/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
index 57c05afcc7..36998f18c1 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
@@ -33,6 +33,7 @@
 		<td class="cat" colspan="2" align="center"><input type="hidden" name="export_option" value="CSV" /><input class="btnmain" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="Reset" name="reset" /></td>
 	</tr>
 	</table>
+	{S_FORM_TOKEN}
 
 </form>
 <!-- ELSE -->
diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html
index b465be7570..37f9924e2e 100644
--- a/phpBB/styles/subsilver2/template/ucp_register.html
+++ b/phpBB/styles/subsilver2/template/ucp_register.html
@@ -105,7 +105,7 @@
 	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>
 </tr>
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 <!-- INCLUDE overall_footer.html -->
\ No newline at end of file
diff --git a/phpBB/styles/subsilver2/template/ucp_remind.html b/phpBB/styles/subsilver2/template/ucp_remind.html
index cf724c3f42..b14fbe8305 100644
--- a/phpBB/styles/subsilver2/template/ucp_remind.html
+++ b/phpBB/styles/subsilver2/template/ucp_remind.html
@@ -20,7 +20,7 @@
 	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="btnmain" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" name="reset" class="btnlite" /></td>
 </tr>
 </table>
-
+{S_FORM_TOKEN}
 </form>
 
 </div>
diff --git a/phpBB/styles/subsilver2/template/ucp_resend.html b/phpBB/styles/subsilver2/template/ucp_resend.html
index 08b6c6c22a..d9881ce679 100644
--- a/phpBB/styles/subsilver2/template/ucp_resend.html
+++ b/phpBB/styles/subsilver2/template/ucp_resend.html
@@ -20,6 +20,7 @@
 	<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="btnmain" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" name="reset" class="btnlite" /></td>
 </tr>
 </table>
+{S_FORM_TOKEN}
 
 </form>
 
-- 
cgit v1.2.1