The new BadWord, all regex, system

[spider.git] / cmd / show / badword.pl

diff --git a/cmd/show/badword.pl b/cmd/show/badword.pl
index a8ef5c571508cbc9bccbeeea50d149a473b24294..947f70a4dd78e87d7758beef62ee516c9bcec86f 100644 (file)
--- a/cmd/show/badword.pl
+++ b/cmd/show/badword.pl
@@ -9,5 +9,30 @@ my ($self, $line) = @_;
 return (1, $self->msg('e5')) if $self->remotecmd;
 # are we permitted?
 return (1, $self->msg('e5')) if $self->priv < 6;
-return $BadWords::badword->show(1, $self);
+my @out;
+my @l;
+my $count = 0;
+
+if ($line =~ /^\s*full/i) {
+       foreach my $w (BadWords::list_regex(1)) {
+               ++$count;
+               push @out, $w; 
+       }
+}
+else {
+       foreach my $w (BadWords::list_regex()) {
+               ++$count;
+               if (@l >= 5) {
+                       push @out, sprintf "%-12s %-12s %-12s %-12s %-12s", @l;
+                       @l = ();
+               }
+               push @l, $w;
+       }
+       push @l, "" while @l < 5;
+       push @out, sprintf "%-12s %-12s %-12s %-12s %-12s", @l;
+}
+
+push @out, "$count BadWords";
+       
+return (1, @out);