From ab5067bb0995cce2afe51803b5f005cc9f994416 Mon Sep 17 00:00:00 2001
From: "travis%sedsystems.ca" <>
Date: Fri, 11 Mar 2005 00:21:33 +0000
Subject: Bug 41972 : Per-user pref to turn quips off Patch by Shane H. W.
 Travis <travis@sedsystems.ca>  r=mkanat  a=justdave

---
 quips.cgi | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'quips.cgi')

diff --git a/quips.cgi b/quips.cgi
index dc0106450..766d1a792 100755
--- a/quips.cgi
+++ b/quips.cgi
@@ -41,10 +41,6 @@ Bugzilla->login(LOGIN_REQUIRED);
 
 my $cgi = Bugzilla->cgi;
 
-if (Param('enablequips') eq "off") {
-    ThrowUserError("quips_disabled");
-}
-    
 my $action = $cgi->param('action') || "";
 
 if ($action eq "show") {
@@ -75,12 +71,12 @@ if ($action eq "show") {
 }
 
 if ($action eq "add") {
-    (Param('enablequips') eq "on" or Param('enablequips') eq "approved")
-      || ThrowUserError("no_new_quips");
-    
+    (Param('quip_list_entry_control') eq "closed") &&
+      ThrowUserError("no_new_quips");
+
     # Add the quip 
-    my $approved = (Param('enablequips') eq "on") ? '1' : '0';
-    $approved = 1 if(UserInGroup('admin'));
+    my $approved = 
+      (Param('quip_list_entry_control') eq "open") || (UserInGroup('admin')) || 0;
     my $comment = $cgi->param("quip");
     $comment || ThrowUserError("need_quip");
     $comment !~ m/</ || ThrowUserError("no_html_in_quips");
-- 
cgit v1.2.3-24-g4f1b