X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=1d09a4769f489744b4c31192c47a8554952203a8;hb=c77ea09e91a5f7c3052e3e30dfb48fcaad1e0dcd;hp=3a45f6ce86f35c35f0542700c5642b0bf76fb1d5;hpb=6c38bca91e6b75002e15cce29c45a894f675e22e;p=spider.git diff --git a/cmd/dx.pl b/cmd/dx.pl index 3a45f6ce..1d09a476 100644 --- a/cmd/dx.pl +++ b/cmd/dx.pl @@ -15,6 +15,13 @@ my $spotted; my $freq; 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; @@ -32,14 +39,14 @@ if ($f[0] =~ /^by$/i) { } # get the freq and callsign either way round -if ($f[0] =~ /[A-Za-z]/) { +if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) { $spotted = uc $f[0]; $freq = $f[1]; -} elsif ($f[0] =~ /^[0-9\.\,]+$/) { +} 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 @@ -92,17 +99,19 @@ if ($spotted le ' ') { return (1, @out) unless $valid; -# change ^ into : for transmission -$line =~ s/\^/:/og; # 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 { - return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $main::systime, $line); - my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall); + 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); + # send orf to the users DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot); }