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

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 970182e4..ce0c304f 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -17,6 +17,7 @@ my @out;
 my $valid = 0;
 my $localonly;
 return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e28')) unless $self->registered;
 
 my @bad;
 if (@bad = BadWords::check($line)) {	
@@ -33,8 +34,9 @@ return (1, $self->msg('dx2')) unless @f >= 2;
 # can be in any order
 
 if ($f[0] =~ /^by$/i) {
+	return (1, $self->msg('e5')) unless $self->priv;
     $spotter = uc $f[1];
-    $line =~ s/^\s*$f[0]\s+$f[1]\s+//;
+    $line =~ s/^\s*\Q$f[0]\s+\Q$f[1]\s+//;
 	$line = $f[2];
 	@f = split /\s+/, $line;
 	return (1, $self->msg('dx2')) unless @f >= 2;
@@ -51,7 +53,6 @@ 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;
@@ -96,14 +97,16 @@ push @out, $self->msg('dx1', $freq) unless $valid;
 # check we have a callsign :-)
 if ($spotted le ' ') {
 	push @out, $self->msg('dx2');
-	
 	$valid = 0;
 }
 
 return (1, @out) unless $valid;
 
-
 # Store it here (but only if it isn't baddx)
+my $t = (int ($main::systime/60)) * 60;
+return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line, $spotter);
+my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall);
+
 if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
 
 	# heaven forfend that we get a 69Mhz band :-)
@@ -111,12 +114,9 @@ if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
 		$self->badcount(($self->badcount||0) + 1);
 	}
 
-	my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
-	push @out, $buf;
+	$self->dx_spot(undef, undef, @spot);
+	return (1);
 } else {
-	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);