From bfcf8bd3fc75891bf41ed1e7892b73129e59e0d3 Mon Sep 17 00:00:00 2001
From: Matthew Vernon <matthew@debian.org>
Date: Thu, 2 Jan 2014 10:49:52 +0000
Subject: [PATCH] Remove options to add subjects, words, posters to any of the
 following lists: bad.subjects.list bad.words.list watch.posters.list
 watch.subjects.list good.subjects.list

This is part of the process of simplifying the ulm mods interface
---
 webstump/scripts/html_output.pl | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/webstump/scripts/html_output.pl b/webstump/scripts/html_output.pl
index 04cddcc..30b9c1c 100644
--- a/webstump/scripts/html_output.pl
+++ b/webstump/scripts/html_output.pl
@@ -271,16 +271,16 @@ sub html_moderate_article {
 <!-- <INPUT TYPE=radio NAME=thread_decision VALUE=preapprove>Preapprove thread, by Subject:</INPUT> -->
 <BR>
 
-<INPUT TYPE=radio NAME=thread_decision VALUE=ban
+<!-- <INPUT TYPE=radio NAME=thread_decision VALUE=ban
   ONCLICK=\"alert( 'Banning a thread is a controversial practice'); \"
->Ban Entire Thread By Subject (Careful!)</INPUT>
-<INPUT TYPE=radio NAME=thread_decision VALUE=watch>Put Entire thread on a Watch, by Subject:</INPUT>
+>Ban Entire Thread By Subject (Careful!)</INPUT> -->
+<!-- <INPUT TYPE=radio NAME=thread_decision VALUE=watch>Put Entire thread on a Watch, by Subject:</INPUT> -->
 
 <BR><BR>
 <I>
-NOTE: Decisions to ban and preapprove posters and threads can be reversed by 
-logging in as \"admin\" and editing respective lists of preapproved
-and banned threads  and posters.
+NOTE: Decisions to ban and whitelist posters can be reversed by 
+logging in as \"admin\" and editing respective lists of whitelisted
+and banned threads.
 ";
 
   &link_to_help( "filter-lists", "automatic filtering and filter lists, blacklisting and preapproved threads." );
@@ -558,7 +558,7 @@ queue.\n";
 
         print "<HR><B>$from: $subject</B>(";
         print "<A HREF=$base_address?action=moderate_article&newsgroup=$newsgroup&" .
-              "moderator=$moderator&password=$password&file=$subdir>Review/Comment/Preapprove</A>)<BR>\n";
+              "moderator=$moderator&password=$password&file=$subdir>Review/Comment/Whitelist</A>)<BR>\n";
         print "<INPUT TYPE=radio NAME=\"decision_$file\" VALUE=approve>Approve\n";
         print "<INPUT TYPE=radio NAME=\"decision_$file\" VALUE=skip>Leave\n";
         print "<INPUT TYPE=radio NAME=\"decision_$file\" VALUE=leave>Back of queue\n";
@@ -764,13 +764,8 @@ sub html_newsgroup_management {
   Configuration List: <SELECT NAME=list_to_edit>
 
     <OPTION VALUE=good.posters.list>Good Posters List
-    <OPTION VALUE=watch.posters.list>Suspicious Posters List
     <OPTION VALUE=bad.posters.list>Banned Posters List
-    <OPTION VALUE=good.subjects.list>Good Subjects List
-    <OPTION VALUE=watch.subjects.list>Suspicious Subjects List
-    <OPTION VALUE=bad.subjects.list>Banned Subjects List
     <OPTION VALUE=watch.words.list>Suspicious Words List
-    <OPTION VALUE=bad.words.list>Banned Words List
 
   </SELECT>
   <INPUT TYPE=submit VALUE=\"Edit\">
-- 
2.30.2