1. Add $main::bumpexisting variable which allows a new connection for a user

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 3876ff1f643228248b7c65a2cd79812cebb88994..b0be3bd83038c781f454acb5db9b54ff82d1e372 100644 (file)
--- 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;
 }
 
@@ -52,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;
@@ -97,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 :-)
@@ -112,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);