added registration

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 1d09a4769f489744b4c31192c47a8554952203a8..3876ff1f643228248b7c65a2cd79812cebb88994 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -15,12 +15,15 @@ my $spotted;
 my $freq;
 my @out;
 my $valid = 0;
+my $localonly;
 return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e28')) unless $self->registered;
 
 my @bad;
 if (@bad = BadWords::check($line)) {   
        $self->badcount(($self->badcount||0) + @bad);
-       return (1, $self->msg('e17', @bad));
+       Log('DXCommand', "$self->{call} swore: $line");
+       $localonly++;
 }
 
 # do we have at least two args?
@@ -49,6 +52,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;
@@ -101,7 +105,13 @@ return (1, @out) unless $valid;
 
 
 # Store it here (but only if it isn't baddx)
-if ($DXProt::baddx->in($spotted)) {
+if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
+
+       # 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 {