From: minima <minima>
Date: Thu, 4 Oct 2001 14:38:55 +0000 (+0000)
Subject: made more improvements
X-Git-Tag: R_1_49~61
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f52bf428cfd46825c2e2fcd3a0ba55097bbe7bd6;p=spider.git

made more improvements
---

diff --git a/cmd/dx.pl b/cmd/dx.pl
index c7161b62..0b2ece1d 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -100,7 +100,7 @@ if (@bad = BadWords::check($line)) {
 }
 
 # Store it here (but only if it isn't baddx)
-if (grep $_ eq $spotted, @DXProt::baddx) {
+if ($DXProt::baddx->in($spotted)) {
 	my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
 	push @out, $buf;
 } else {
diff --git a/data/badw_regex.issue b/data/badw_regex.issue
index b8085d56..5635fe43 100644
--- a/data/badw_regex.issue
+++ b/data/badw_regex.issue
@@ -17,3 +17,5 @@ arsehole
 buger
 jihad
 alah
+raghead
+muslim
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index f6e1e75d..71cef0e2 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -415,7 +415,7 @@ sub normal
 			}
 
 			# is it 'baddx'
-			if ($baddx->in($field[2]) || BadWords::check($field[2])) {
+			if ($baddx->in($field[2]) || BadWords::check($field[2]) || $field[2] =~ /COCK/) {
 				dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
 				return;
 			}