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

diff --git a/cmd/dx.pl b/cmd/dx.pl
index c946d761..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;
@@ -43,7 +44,7 @@ if ($f[0] =~ /[A-Za-z]/) {
 }
 
 # 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,14 +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, (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
@@ -108,3 +112,8 @@ if (grep $_ eq $spotted, @DXProt::baddx) {
 }
 
 return (1, @out);
+
+
+
+
+