X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=1d09a4769f489744b4c31192c47a8554952203a8;hb=c77ea09e91a5f7c3052e3e30dfb48fcaad1e0dcd;hp=c946d76107b6a70f46ff0bcae4506888711ebe52;hpb=fe78618f23392a6ae58542b78cc4c8dbc84e71c5;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index c946d761..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,18 +39,18 @@ 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
-$line = $f[2];
+$line = $f[2] || " ";
 @f = split /\s+/, $line;
 
 # bash down the list of bands until a valid one is reached
@@ -92,19 +99,27 @@ 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) {
-	my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
+if ($DXProt::baddx->in($spotted)) {
+	my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
 	push @out, $buf;
 } else {
-	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);
 	}
 }
 
 return (1, @out);
+
+
+
+
+