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

1 files changed, 36 insertions, 34 deletions

diff --git a/web/html/packages.php b/web/html/packages.php
index aa1d04c..ec76e41 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -38,46 +38,48 @@ if (isset($_POST['IDs'])) {
 
 # Determine what action to do
 $output = "";
-if (current_action("do_Flag")) {
-	$output = pkg_flag($atype, $ids, true);
-} elseif (current_action("do_UnFlag")) {
-	$output = pkg_flag($atype, $ids, False);
-} elseif (current_action("do_Adopt")) {
-	$output = pkg_adopt($atype, $ids, true);
-} elseif (current_action("do_Disown")) {
-	$output = pkg_adopt($atype, $ids, False);
-} elseif (current_action("do_Vote")) {
-	$output = pkg_vote($atype, $ids, true);
-} elseif (current_action("do_UnVote")) {
-	$output = pkg_vote($atype, $ids, False);
-} elseif (current_action("do_Delete")) {
-	if (isset($_POST['confirm_Delete'])) {
-		if (!isset($_POST['merge_Into']) || empty($_POST['merge_Into'])) {
-			$output = pkg_delete($atype, $ids, NULL);
-			unset($_GET['ID']);
-		}
-		else {
-			$mergepkgid = pkgid_from_name($_POST['merge_Into']);
-			if ($mergepkgid) {
-				$output = pkg_delete($atype, $ids, $mergepkgid);
+if (check_token()) {
+	if (current_action("do_Flag")) {
+		$output = pkg_flag($atype, $ids, true);
+	} elseif (current_action("do_UnFlag")) {
+		$output = pkg_flag($atype, $ids, False);
+	} elseif (current_action("do_Adopt")) {
+		$output = pkg_adopt($atype, $ids, true);
+	} elseif (current_action("do_Disown")) {
+		$output = pkg_adopt($atype, $ids, False);
+	} elseif (current_action("do_Vote")) {
+		$output = pkg_vote($atype, $ids, true);
+	} elseif (current_action("do_UnVote")) {
+		$output = pkg_vote($atype, $ids, False);
+	} elseif (current_action("do_Delete")) {
+		if (isset($_POST['confirm_Delete'])) {
+			if (!isset($_POST['merge_Into']) || empty($_POST['merge_Into'])) {
+				$output = pkg_delete($atype, $ids, NULL);
 				unset($_GET['ID']);
 			}
 			else {
-				$output = __("Cannot find package to merge votes and comments into.");
+				$mergepkgid = pkgid_from_name($_POST['merge_Into']);
+				if ($mergepkgid) {
+					$output = pkg_delete($atype, $ids, $mergepkgid);
+					unset($_GET['ID']);
+				}
+				else {
+					$output = __("Cannot find package to merge votes and comments into.");
+				}
 			}
 		}
+		else {
+			$output = __("The selected packages have not been deleted, check the confirmation checkbox.");
+		}
+	} elseif (current_action("do_Notify")) {
+		$output = pkg_notify($atype, $ids);
+	} elseif (current_action("do_UnNotify")) {
+		$output = pkg_notify($atype, $ids, False);
+	} elseif (current_action("do_DeleteComment")) {
+		$output = pkg_delete_comment($atype);
+	} elseif (current_action("do_ChangeCategory")) {
+		$output = pkg_change_category($atype);
 	}
-	else {
-		$output = __("The selected packages have not been deleted, check the confirmation checkbox.");
-	}
-} elseif (current_action("do_Notify")) {
-	$output = pkg_notify($atype, $ids);
-} elseif (current_action("do_UnNotify")) {
-	$output = pkg_notify($atype, $ids, False);
-} elseif (current_action("do_DeleteComment")) {
-	$output = pkg_delete_comment($atype);
-} elseif (current_action("do_ChangeCategory")) {
-	$output = pkg_change_category($atype);
 }
 
 html_header($title);