chiark
/
gitweb
/
~webstump
/
modbot-ulm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add comments to make the two mod-screen functions more obvious
[modbot-ulm.git]
/
webstump
/
scripts
/
html_output.pl
diff --git
a/webstump/scripts/html_output.pl
b/webstump/scripts/html_output.pl
index 1f4a15d14e24c1c488c4381d047d2dea39142503..4b0e576d1619dc60aad994fc4bb2dbe221d41640 100644
(file)
--- a/
webstump/scripts/html_output.pl
+++ b/
webstump/scripts/html_output.pl
@@
-193,7
+193,7
@@
of this installation. <HR>
&end_html;
}
&end_html;
}
-# main moderation page --
old
version
+# main moderation page --
single-article
version
sub html_moderate_article {
my $newsgroup = &required_parameter( 'newsgroup' );
my $moderator = $request{'moderator'};
sub html_moderate_article {
my $newsgroup = &required_parameter( 'newsgroup' );
my $moderator = $request{'moderator'};
@@
-247,7
+247,7
@@
sub html_moderate_article {
&html_print_credentials;
print "<SELECT NAME=\"decision_$file\">
<OPTION VALUE=\"approve\">Approve</OPTION>
&html_print_credentials;
print "<SELECT NAME=\"decision_$file\">
<OPTION VALUE=\"approve\">Approve</OPTION>
-<OPTION VALUE=\"leave\">Put to back of queue</OPTION>
+<OPTION VALUE=\"leave\"
SELECTED
>Put to back of queue</OPTION>
<OPTION VALUE=\"consider\">Back of queue, adding mark requesting further consideration</OPTION>
";
<OPTION VALUE=\"consider\">Back of queue, adding mark requesting further consideration</OPTION>
";
@@
-262,7
+262,7
@@
sub html_moderate_article {
print "<BR>
<INPUT TYPE=radio NAME=poster_decision VALUE=nothing CHECKED>Don't change poster's status</INPUT>
<INPUT TYPE=radio NAME=poster_decision VALUE=preapprove
print "<BR>
<INPUT TYPE=radio NAME=poster_decision VALUE=nothing CHECKED>Don't change poster's status</INPUT>
<INPUT TYPE=radio NAME=poster_decision VALUE=preapprove
->
Preapprove
poster</INPUT>
+>
White-list
poster</INPUT>
<INPUT TYPE=radio NAME=poster_decision VALUE=ban
ONCLICK=\"alert( 'Banning a poster is a controversial practice'); \"
> Ban All Posts by this Person (Careful!)</INPUT>
<INPUT TYPE=radio NAME=poster_decision VALUE=ban
ONCLICK=\"alert( 'Banning a poster is a controversial practice'); \"
> Ban All Posts by this Person (Careful!)</INPUT>
@@
-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=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'); \"
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>
<BR><BR>
<I>
-NOTE: Decisions to ban and
preapprove posters and thread
s can be reversed by
-logging in as \"admin\" and editing respective lists of
preapprov
ed
-and banned threads
and posters
.
+NOTE: Decisions to ban and
whitelist poster
s can be reversed by
+logging in as \"admin\" and editing respective lists of
whitelist
ed
+and banned threads.
";
&link_to_help( "filter-lists", "automatic filtering and filter lists, blacklisting and preapproved threads." );
";
&link_to_help( "filter-lists", "automatic filtering and filter lists, blacklisting and preapproved threads." );
@@
-478,7
+478,7
@@
sub get_queue_list ($) {
return ($dir, @articles);
}
return ($dir, @articles);
}
-# main moderation page
+# main moderation page
-- multiple-articles version
sub html_moderation_screen {
my $newsgroup = &required_parameter( 'newsgroup' );
my $moderator = $request{'moderator'};
sub html_moderation_screen {
my $newsgroup = &required_parameter( 'newsgroup' );
my $moderator = $request{'moderator'};
@@
-529,6
+529,10
@@
queue.\n";
<FORM METHOD=$request_method action=$base_address>
<INPUT NAME=action VALUE=approval_decision TYPE=hidden>";
&html_print_credentials;
<FORM METHOD=$request_method action=$base_address>
<INPUT NAME=action VALUE=approval_decision TYPE=hidden>";
&html_print_credentials;
+
+ print "<HR> <INPUT TYPE=submit VALUE=Submit>
+<INPUT TYPE=reset VALUE=Reset>
+";
my $file, $subject = "No Subject", $from = "From nobody";
my $form_not_empty = "";
my $file, $subject = "No Subject", $from = "From nobody";
my $form_not_empty = "";
@@
-558,7
+562,7
@@
queue.\n";
print "<HR><B>$from: $subject</B>(";
print "<A HREF=$base_address?action=moderate_article&newsgroup=$newsgroup&" .
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";
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
+768,8
@@
sub html_newsgroup_management {
Configuration List: <SELECT NAME=list_to_edit>
<OPTION VALUE=good.posters.list>Good Posters List
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=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=watch.words.list>Suspicious Words List
- <OPTION VALUE=bad.words.list>Banned Words List
</SELECT>
<INPUT TYPE=submit VALUE=\"Edit\">
</SELECT>
<INPUT TYPE=submit VALUE=\"Edit\">
@@
-812,6
+811,12
@@
sub html_newsgroup_management {
print "</UL>\n";
print "</UL>\n";
+ print "<HR><FORM METHOD=$request_method action=$base_address>";
+ &html_print_credentials;
+ print "<INPUT NAME=action VALUE=moderation_screen TYPE=hidden>
+ <INPUT TYPE=submit VALUE=\"Go to moderation screen\">
+ </FORM>";
+
&end_html;
}
&end_html;
}