X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=cmd%2Fdx.pl;h=b0be3bd83038c781f454acb5db9b54ff82d1e372;hb=aad4e36d3753bf8dde671d14d73b1d9785b9ff41;hp=46d427e0fb57333c5fe78a2425394429df65ac7c;hpb=0dc47d7ba34d8ea89f210c024863d01b2b32122b;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 46d427e0..b0be3bd8 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -34,10 +34,11 @@ return (1, $self->msg('dx2')) unless @f >= 2;
 # can be in any order
 
 if ($f[0] =~ /^by$/i) {
+	return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv;
     $spotter = uc $f[1];
-    $line =~ s/^\s*$f[0]\s+$f[1]\s+//;
-	$line = $f[2];
-	@f = split /\s+/, $line;
+    $line =~ s/\s*$f[0]\s+$f[1]\s+//;
+#	$line = $f[2];
+	@f = split /\s+/, $line, 3;
 	return (1, $self->msg('dx2')) unless @f >= 2;
 }
 
@@ -103,7 +104,7 @@ 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('dupspot')) if Spot::dup($freq, $spotted, $t, $line, $spotter);
+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) {