X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=3f366dffb20f82ef5bb508c370b55f836066ce9e;hb=fe40d951b9d78262b2c3be192ad3986fa4164bcf;hp=5e9eec1ccf6e78a12a358b46eb11b7c51ff200f7;hpb=88665a2bed3b9ec9e97237938a95a045b2a21bb4;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 5e9eec1c..3f366dff 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,15 +93,17 @@ 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 {
-	return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $main::systime, $line);
+	return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, (int ($main::systime/60)) * 60, $line);
 	my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
 	if (@spot) {
 		# send orf to the users