X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Funset%2Fbadword.pl;h=6d49de3afba8df192db4786ce815911d62a734d8;hb=606b9690c7bb9e293cb4a03507f0280eea05d9ce;hp=d2b7fe3153720c9328d4ada1e9b271fcaa7c2571;hpb=6ec22e78a4a344ce675645fabf18b2a1971f364a;p=spider.git

diff --git a/cmd/unset/badword.pl b/cmd/unset/badword.pl
index d2b7fe31..6d49de3a 100644
--- a/cmd/unset/badword.pl
+++ b/cmd/unset/badword.pl
@@ -9,6 +9,24 @@ my ($self, $line) = @_;
 return (1, $self->msg('e5')) if $self->remotecmd;
 # are we permitted?
 return (1, $self->msg('e5')) if $self->priv < 6;
-$line = join(' ', map {s|[/-]\d+$||; $_} split(/\s+/, $line));
-return $BadWords::badword->unset(8, $self->msg('e6'), $self, $line);
+
+my @words = split /\s+/, uc $line;
+my @out;
+my $count = 0;
+foreach my $w (@words) {
+	my @in;
+	
+	unless (@in = BadWords::check($w)) {
+		push @out, "BadWord $w not defined, ignored";
+	} else {
+		@in = BadWords::del_regex($w);
+		push @out, "BadWord $w removed";
+		$count++;
+	}
+}
+if ($count) {
+	BadWords::generate_regex();
+	BadWords::put();
+}
+return (1, @out);