X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=1d09a4769f489744b4c31192c47a8554952203a8;hb=c77ea09e91a5f7c3052e3e30dfb48fcaad1e0dcd;hp=c7161b62b7887c99d232362b1249e61ad6c0060c;hpb=c4f04ae165fdc765f3baa26fa2b28b52cf967674;p=spider.git diff --git a/cmd/dx.pl b/cmd/dx.pl index c7161b62..1d09a476 100644 --- 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; @@ -93,14 +99,9 @@ if ($spotted le ' ') { return (1, @out) unless $valid; -my @bad; -if (@bad = BadWords::check($line)) { - $self->badcount(($self->badcount||0) + @bad); - 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)) { my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter); push @out, $buf; } else {