rearrange spot broadcast so that it copes according to terminal type

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 6e14cda5caa4d36038326085fb39b1fbd3f2e297..a7dc99ada65910c810fb45b8d31cb339de175067 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -15,7 +15,16 @@ 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);
+       Log('DXCommand', "$self->{call} swore: $line");
+       $localonly++;
+}
 
 # do we have at least two args?
 return (1, $self->msg('dx2')) unless @f >= 2;
@@ -33,14 +42,14 @@ if ($f[0] =~ /^by$/i) {
 }
 
 # get the freq and callsign either way round
-if (is_freq($f[1])) {
+if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
        $spotted = uc $f[0];
        $freq = $f[1];
-} elsif (is_freq($f[0])) {
+} elsif (is_freq($f[0]) && $f[1] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
     $freq = $f[0];
        $spotted = uc $f[1];
 } else {
-       return (1, $self->msg('dx2'));
+       return (1, $self->msg('dx3'));
 }
 
 # make line the rest of the line
@@ -87,25 +96,26 @@ push @out, $self->msg('dx1', $freq) unless $valid;
 # check we have a callsign :-)
 if ($spotted le ' ') {
        push @out, $self->msg('dx2');
-       
        $valid = 0;
 }
 
 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) {
-       my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
-       push @out, $buf;
+my $t = (int ($main::systime/60)) * 60;
+return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line);
+my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall);
+
+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);
+       }
+
+       $self->dx_spot(undef, undef, @spot);
+       return (1);
 } else {
-       my $t = (int ($main::systime/60)) * 60;
-       return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line);
-       my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall);
        if (@spot) {
                # store it 
                Spot::add(@spot);