summaryrefslogtreecommitdiffstats
path: root/editproducts.cgi
diff options
context:
space:
mode:
authorjocuri%softhome.net <>2004-12-11 22:33:27 +0100
committerjocuri%softhome.net <>2004-12-11 22:33:27 +0100
commit1986e290b8d554f9e2c12f44dd7e119792378139 (patch)
tree2f3f2062f699a4c9e13dbb42d60a5809c967da04 /editproducts.cgi
parentf643372f6f6224a45dde4248d728ff7c1f20bba9 (diff)
downloadbugzilla-1986e290b8d554f9e2c12f44dd7e119792378139.tar.gz
bugzilla-1986e290b8d554f9e2c12f44dd7e119792378139.tar.xz
Patch for bug 271474: Fix SQL syntax error when updating max votes per bug in editproducts.cgi and questionable activity log entries when an admin changes the votes-to-confirm setting to a lower value and bugs get confirmed by popular vote; patch by Nick.Barnes@pobox.com, r=vladd, a=justdave.
Diffstat (limited to 'editproducts.cgi')
-rwxr-xr-xeditproducts.cgi25
1 files changed, 15 insertions, 10 deletions
diff --git a/editproducts.cgi b/editproducts.cgi
index 4098274d0..1437e82f4 100755
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -1384,8 +1384,9 @@ if ($action eq 'update') {
SendSQL("UNLOCK TABLES");
if ($checkvotes) {
- print "Checking existing votes in this product for anybody who now has too many votes.";
+ # 1. too many votes for a single user on a single bug.
if ($maxvotesperbug < $votesperuser) {
+ print "<br>Checking existing votes in this product for anybody who now has too many votes for a single bug.";
SendSQL("SELECT votes.who, votes.bug_id " .
"FROM votes, bugs " .
"WHERE bugs.bug_id = votes.bug_id " .
@@ -1403,6 +1404,12 @@ if ($action eq 'update') {
print qq{<br>Removed votes for bug <A HREF="show_bug.cgi?id=$id">$id</A> from $name\n};
}
}
+
+ # 2. too many total votes for a single user.
+ # This part doesn't work in the general case because RemoveVotes
+ # doesn't enforce votesperuser (except per-bug when it's less
+ # than maxvotesperbug). See RemoveVotes in globals.pl.
+ print "<br>Checking existing votes in this product for anybody who now has too many total votes.";
SendSQL("SELECT votes.who, votes.vote_count FROM votes, bugs " .
"WHERE bugs.bug_id = votes.bug_id " .
" AND bugs.product_id = $product_id");
@@ -1422,7 +1429,7 @@ if ($action eq 'update') {
" AND bugs.product_id = $product_id " .
" AND votes.who = $who");
while (MoreSQLData()) {
- my $id = FetchSQLData();
+ my ($id) = FetchSQLData();
RemoveVotes($id, $who,
"The rules for voting on this product has changed; you had too many\ntotal votes, so all votes have been removed.");
my $name = DBID_to_name($who);
@@ -1430,20 +1437,18 @@ if ($action eq 'update') {
}
}
}
+ # 3. enough votes to confirm
SendSQL("SELECT bug_id FROM bugs " .
"WHERE product_id = $product_id " .
" AND bug_status = '$::unconfirmedstate' " .
" AND votes >= $votestoconfirm");
- my @list;
- while (MoreSQLData()) {
- push(@list, FetchOneColumn());
+ if (MoreSQLData()) {
+ print "<br>Checking unconfirmed bugs in this product for any which now have sufficient votes.";
}
- foreach my $id (@list) {
- SendSQL("SELECT who FROM votes WHERE bug_id = $id");
- my $who = FetchOneColumn();
- CheckIfVotedConfirmed($id, $who);
+ while (MoreSQLData()) {
+ # The user id below is used for activity log purposes
+ CheckIfVotedConfirmed(FetchOneColumn(), Bugzilla->user->id);
}
-
}
PutTrailer($localtrailer);