Merge branch 'maint'

Conflicts:
	web/html/account.php
	web/html/addvote.php
	web/html/pkgsubmit.php
	web/lib/acctfuncs.inc.php
	web/template/actions_form.php
	web/template/pkg_comment_form.php
	web/template/pkg_comments.php
	web/template/pkg_details.php
	web/template/pkg_search_results.php
	web/template/tu_details.php

7 files changed, 10 insertions, 1 deletions

diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php
index 32379a70..c32eb94d 100644
--- a/web/template/account_edit_form.php
+++ b/web/template/account_edit_form.php
@@ -3,6 +3,7 @@
 		<input type="hidden" name="Action" value="<?php echo $A ?>" />
 		<?php if ($UID): ?>
 		<input type="hidden" name="ID" value="<?php echo $UID ?>" />
+		<input type="hidden" name="token" value="<?php print htmlspecialchars($_COOKIE['AURSID']) ?>" /> </div>
 		<?php endif; ?>
 	</fieldset>
 	<table>
diff --git a/web/template/actions_form.php b/web/template/actions_form.php
index e5ab7c2e..ff0fd4e5 100644
--- a/web/template/actions_form.php
+++ b/web/template/actions_form.php
@@ -3,6 +3,7 @@
 		<fieldset>
 			<input type="hidden" name="IDs[<?php echo $row['ID'] ?>]" value="1" />
 			<input type="hidden" name="ID" value="<?php echo $row['ID'] ?>" />
+			<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
 
 		<?php if (user_voted($uid, $row['ID'])): ?>
 			<input type="submit" class="button" name="do_UnVote" value="<?php echo __("UnVote") ?>" />
diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php
index 8430a89c..95d2cb05 100644
--- a/web/template/pkg_comment_form.php
+++ b/web/template/pkg_comment_form.php
@@ -3,12 +3,13 @@
 	<form call="general-form" action="<?php echo $_SERVER['REQUEST_URI'] ?>" method="post">
 		<fieldset>
 <?php
-if (isset($_REQUEST['comment'])) {
+if (isset($_REQUEST['comment']) && check_token()) {
 	echo '<p>' . __('Comment has been added.') . '</p>';
 }
 ?>
 			<div>
 				<input type="hidden" name="ID" value="<?php echo intval($_REQUEST['ID']) ?>" />
+				<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
 			</div>
 			<p>
 				<label for="id_comment"><?php echo __("Comment") . ':' ?></label>
diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php
index 4e9dfa35..02f49633 100644
--- a/web/template/pkg_comments.php
+++ b/web/template/pkg_comments.php
@@ -18,6 +18,7 @@ $count = package_comments_count($_GET['ID']);
 					<fieldset style="display:inline;">
 						<input type="hidden" name="action" value="do_DeleteComment" />
 						<input type="hidden" name="comment_id" value="<?php echo $row['ID'] ?>" />
+						<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
 						<input type="image" src="images/x.png" alt="<?php echo __('Delete comment') ?> name="submit" value="1" />
 					</fieldset>
 				</form>
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index 023fef11..b41fdede 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -60,6 +60,9 @@ if ($SID && ($uid == $row["MaintainerUID"] ||
 				<form method="post" action="packages.php?ID=<?php echo $pkgid ?>">
 					<div>
 						<input type="hidden" name="action" value="do_ChangeCategory" />
+						<?php if ($SID): ?>
+						<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
+						<?php endif; ?>
 						<select name="category_id">
 <?php
 	foreach ($catarr as $cid => $catname):
diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php
index d676c0a3..90766751 100644
--- a/web/template/pkg_search_results.php
+++ b/web/template/pkg_search_results.php
@@ -115,6 +115,7 @@ if (!$result): ?>
 						<input type="text" id="merge_Into" name="merge_Into" />
 						<input type="checkbox" name="confirm_Delete" value="1" /> <?php echo __("Confirm") ?>
 					<?php endif; ?>
+					<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
 					<input type="submit" class="button" style="width: 80px" value="<?php echo __("Go") ?>" />
 				</p>
 			<?php endif; # if ($SID) ?>
diff --git a/web/template/tu_details.php b/web/template/tu_details.php
index 33e87a85..38015e1e 100644
--- a/web/template/tu_details.php
+++ b/web/template/tu_details.php
@@ -67,6 +67,7 @@
 			<input type="submit" class="button" name="voteNo" value="<?php print __("No") ?>" />
 			<input type="submit" class="button" name="voteAbstain" value="<?php print __("Abstain") ?>" />
 			<input type="hidden" name="doVote" value="1" />
+			<input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" />
 		</fieldset>
 	</form>
 <?php else: