X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=c7161b62b7887c99d232362b1249e61ad6c0060c;hb=881637ac550fc824c3f8784f7fa8253b47ef5a64;hp=a4ea8464b8a807b669e58ce4d7a31429221142bb;hpb=55f14d9038abb44d61ac63298f9f39b9e53a39d1;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index a4ea8464..c7161b62 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -33,14 +33,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
@@ -94,7 +94,8 @@ if ($spotted le ' ') {
 return (1, @out) unless $valid;
 
 my @bad;
-if (@bad = BadWords::check($line)) {
+if (@bad = BadWords::check($line)) {	
+	$self->badcount(($self->badcount||0) + @bad);
 	return (1, $self->msg('e17', @bad));
 }