X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=970182e4e28062b73b563c174bc024f20d03a9a6;hb=bbcb636f1bc71eb1426685ef64382ea42d27ecfb;hp=c7161b62b7887c99d232362b1249e61ad6c0060c;hpb=c4f04ae165fdc765f3baa26fa2b28b52cf967674;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index c7161b62..970182e4 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -15,8 +15,16 @@ my $spotted;
 my $freq;
 my @out;
 my $valid = 0;
+my $localonly;
 return (1, $self->msg('e5')) if $self->remotecmd;
 
+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;
 
@@ -43,6 +51,7 @@ if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
 	return (1, $self->msg('dx3'));
 }
 
+
 # make line the rest of the line
 $line = $f[2] || " ";
 @f = split /\s+/, $line;
@@ -93,14 +102,15 @@ 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) || $freq =~ /^69/ || $localonly) {
+
+	# heaven forfend that we get a 69Mhz band :-)
+	if ($freq =~ /^69/) {
+		$self->badcount(($self->badcount||0) + 1);
+	}
+
 	my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
 	push @out, $buf;
 } else {