DX 69 will act as baddx

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 85dc4cf91f47aba2df092596b78eca31b2d218f5..73ba0de0e4275dd74d11d4c63f06244146673786 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -17,6 +17,12 @@ my @out;
 my $valid = 0;
 return (1, $self->msg('e5')) if $self->remotecmd;
 
+my @bad;
+if (@bad = BadWords::check($line)) {   
+       $self->badcount(($self->badcount||0) + @bad);
+       return (1, $self->msg('e17', @bad));
+}
+
 # do we have at least two args?
 return (1, $self->msg('dx2')) unless @f >= 2;
 
@@ -43,6 +49,7 @@ if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
        return (1, $self->msg('dx3'));
 }
 
+
 # make line the rest of the line
 $line = $f[2] || " ";
 @f = split /\s+/, $line;
@@ -93,13 +100,15 @@ if ($spotted le ' ') {
 
 return (1, @out) unless $valid;
 
-my @bad;
-if (@bad = BadWords::check($line)) {
-       return (1, $self->msg('e17', @bad));
-}
 
 # Store it here (but only if it isn't baddx)
-if (grep $_ eq $spotted, @DXProt::baddx) {
+if ($DXProt::baddx->in($spotted) || $freq =~ /^69/) {
+
+       # heaven forfend that we get a 69Mhz band :-)
+       if ($freq =~ /^69/) {
+               $self->badcount(($self->badcount||0) + 1);
+       }
+
        my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
        push @out, $buf;
 } else {