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;
if (@bad = BadWords::check($line)) {
# 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;
}
return (1, $self->msg('dx3'));
}
-
# make line the rest of the line
$line = $f[2] || " ";
@f = split /\s+/, $line;
# 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;
+my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall);
+my $thing = Thingy::Dx->new(origin=>$main::mycall, group=>'DX', user=>$spotter);
+$thing->from_DXProt(spotdata=>\@spot);
+
if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
# heaven forfend that we get a 69Mhz band :-)
if ($freq =~ /^69/) {
$self->badcount(($self->badcount||0) + 1);
}
-
- my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
- push @out, $buf;
} 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);
-
- # 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);