made more improvements

diff --git a/cmd/dx.pl b/cmd/dx.pl
index c7161b62b7887c99d232362b1249e61ad6c0060c..0b2ece1d6b250cd0808f05205c455ed2967520f5 100644 (file)
--- 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 b8085d56c84e8618fff195439d8d0a9d48230a0f..5635fe43dceb0f30f1f19d62a5bf1de2dafec43e 100644 (file)
--- 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 f6e1e75dc86c0ff093348eb945ab2db35141e711..71cef0e220d81071f5ddf931973020cb301a1b49 100644 (file)
--- 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;
                        }