X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=7ab6cce2e4d27ae2422cced80993092381f497d1;hb=0c5ba14533787430381b46739575d876cd1186ba;hp=eefbb8603380ad7e7c8978e64290598d6d290f02;hpb=7cf8fad46075f1ca2b8b30475a26a881c031a0ad;p=spider.git

diff --git a/cmd/dx.pl b/cmd/dx.pl
index eefbb860..7ab6cce2 100644
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -16,7 +16,7 @@ my $freq;
 my @out;
 my $valid = 0;
 my $localonly;
-return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 return (1, $self->msg('e28')) unless $self->registered;
 
 my @bad;
@@ -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,8 +104,9 @@ 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);
+my $thing = Thingy::Dx->new(user=>$spotter);
+$thing->from_DXProt(spotdata=>\@spot);
 
 if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
 
@@ -112,19 +114,10 @@ if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
 	if ($freq =~ /^69/) {
 		$self->badcount(($self->badcount||0) + 1);
 	}
-
-	$self->dx_spot(undef, undef, @spot);
-	return (1);
 } else {
-	if (@spot) {
-		# store it 
-		Spot::add(@spot);
-
-		# send orf to the users
-		DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
-	}
+	$thing->queue($self);
 }
-
+push @out, $thing->gen_DXCommandmode($self);
 return (1, @out);