finally fixed the regexes

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index a4ea8464b8a807b669e58ce4d7a31429221142bb..1d09a4769f489744b4c31192c47a8554952203a8 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;
 
@@ -33,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
@@ -93,13 +99,9 @@ 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)) {
        my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
        push @out, $buf;
 } else {