aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjustdave%syndicomm.com <>2003-01-15 14:48:12 +0000
committerjustdave%syndicomm.com <>2003-01-15 14:48:12 +0000
commit77b86e4c02e0057a573594afdd84ba15c643a4fc (patch)
tree4b55a172f4521bdd9ee3973fd1a70a19e51aab1d /quips.cgi
parentBug 148093: editmilestones.cgi shows 'xyzzy' as product bug count. r=bbaetz, ... (diff)
downloadbugzilla-77b86e4c02e0057a573594afdd84ba15c643a4fc.tar.gz
bugzilla-77b86e4c02e0057a573594afdd84ba15c643a4fc.tar.bz2
bugzilla-77b86e4c02e0057a573594afdd84ba15c643a4fc.zip
Bug 184309: Adds an optional disabled state to quips, which allows quips to be moderated if the admin so chooses.
Patch by Tobias Burnus <burnus@gmx.de> r=joel, a=justdave
Diffstat (limited to 'quips.cgi')
-rwxr-xr-xquips.cgi44
1 files changed, 39 insertions, 5 deletions
diff --git a/quips.cgi b/quips.cgi
index d152234ac..51e9fc789 100755
--- a/quips.cgi
+++ b/quips.cgi
@@ -21,6 +21,7 @@
# Contributor(s): Owen Taylor <otaylor@redhat.com>
# Gervase Markham <gerv@gerv.net>
# David Fallon <davef@tetsubo.com>
+# Tobias Burnus <burnus@net-b.de>
use strict;
@@ -46,18 +47,20 @@ my $action = $::FORM{'action'} || "";
if ($action eq "show") {
# Read in the entire quip list
- SendSQL("SELECT quipid,userid,quip FROM quips");
+ SendSQL("SELECT quipid, userid, quip, approved FROM quips");
my $quips;
my @quipids;
while (MoreSQLData()) {
- my ($quipid, $userid, $quip) = FetchSQLData();
- $quips->{$quipid} = {'userid' => $userid, 'quip' => $quip};
+ my ($quipid, $userid, $quip, $approved) = FetchSQLData();
+ $quips->{$quipid} = {'userid' => $userid, 'quip' => $quip,
+ 'approved' => $approved};
push(@quipids, $quipid);
}
my $users;
foreach my $quipid (@quipids) {
+ my $userid = $quips->{$quipid}{'userid'};
if (not defined $users->{$userid}) {
SendSQL("SELECT login_name FROM profiles WHERE userid = $userid");
$users->{$userid} = FetchSQLData();
@@ -70,18 +73,49 @@ if ($action eq "show") {
}
if ($action eq "add") {
- (Param('enablequips') eq "on") || ThrowUserError("no_new_quips");
+ (Param('enablequips') eq "on" or Param('enablequips') eq "approved")
+ || ThrowUserError("no_new_quips");
# Add the quip
+ my $approved = (Param('enablequips') eq "on") ? '1' : '0';
+ $approved = 1 if(UserInGroup('admin'));
my $comment = $::FORM{"quip"};
$comment || ThrowUserError("need_quip");
$comment !~ m/</ || ThrowUserError("no_html_in_quips");
- SendSQL("INSERT INTO quips (userid, quip) VALUES (". $userid . ", " . SqlQuote($comment) . ")");
+ SendSQL("INSERT INTO quips (userid, quip, approved) VALUES " .
+ '(' . $userid . ', ' . SqlQuote($comment) . ', ' . $approved . ')');
$vars->{'added_quip'} = $comment;
}
+if ($action eq 'approve') {
+ # Read in the entire quip list
+ SendSQL("SELECT quipid, approved FROM quips");
+
+ my %quips;
+ while (MoreSQLData()) {
+ my ($quipid, $approved) = FetchSQLData();
+ $quips{$quipid} = $approved;
+ }
+
+ my @approved;
+ my @unapproved;
+ foreach my $quipid (keys %quips) {
+ my $form = ($::FORM{'quipid_'.$quipid}) ? 1 : 0;
+ if($quips{$quipid} ne $form) {
+ if($form) { push(@approved, $quipid); }
+ else { push(@unapproved, $quipid); }
+ }
+ }
+ SendSQL("UPDATE quips SET approved = 1 WHERE quipid IN (" .
+ join(",", @approved) . ")") if($#approved > -1);
+ SendSQL("UPDATE quips SET approved = 0 WHERE quipid IN (" .
+ join(",", @unapproved) . ")") if($#unapproved > -1);
+ $vars->{ 'approved' } = \@approved;
+ $vars->{ 'unapproved' } = \@unapproved;
+}
+
if ($action eq "delete") {
if (!UserInGroup('admin')) {
ThrowUserError("quips_edit_denied");