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;
# 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;
}
# 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);
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) {
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);