X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=a4ea8464b8a807b669e58ce4d7a31429221142bb;hb=55f14d9038abb44d61ac63298f9f39b9e53a39d1;hp=7684542eb19251f1d87dafa8253232f4b8bea4e9;hpb=0bd9d2811cc42417676a1b11b121681c2377d70a;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 7684542e..a4ea8464 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -15,6 +15,7 @@ my $spotted;
 my $freq;
 my @out;
 my $valid = 0;
+return (1, $self->msg('e5')) if $self->remotecmd;
 
 # do we have at least two args?
 return (1, $self->msg('dx2')) unless @f >= 2;
@@ -92,19 +93,31 @@ if ($spotted le ' ') {
 
 return (1, @out) unless $valid;
 
-# change ^ into : for transmission
-$line =~ s/\^/:/og;
+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) {
-	my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
+	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);
+
+
+
+
+