my $freq;
my @out;
my $valid = 0;
+my $localonly;
return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e28')) unless $self->registered;
my @bad;
if (@bad = BadWords::check($line)) {
$self->badcount(($self->badcount||0) + @bad);
- return (1, $self->msg('e17', @bad));
+ Log('DXCommand', "$self->{call} swore: $line");
+ $localonly++;
}
# do we have at least two args?
if ($f[0] =~ /^by$/i) {
$spotter = uc $f[1];
- $line =~ s/^\s*$f[0]\s+$f[1]\s+//;
+ $line =~ s/^\s*\Q$f[0]\s+\Q$f[1]\s+//;
$line = $f[2];
@f = split /\s+/, $line;
return (1, $self->msg('dx2')) unless @f >= 2;
# 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)
-if ($DXProt::baddx->in($spotted)) {
- my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
- push @out, $buf;
+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 :-)
+ if ($freq =~ /^69/) {
+ $self->badcount(($self->badcount||0) + 1);
+ }
+
+ $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);