projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add shortform sh/st like disply to sh/user like ak1a
[spider.git]
/
cmd
/
dx.pl
diff --git
a/cmd/dx.pl
b/cmd/dx.pl
index c7161b62b7887c99d232362b1249e61ad6c0060c..970182e4e28062b73b563c174bc024f20d03a9a6 100644
(file)
--- a/
cmd/dx.pl
+++ b/
cmd/dx.pl
@@
-15,8
+15,16
@@
my $spotted;
my $freq;
my @out;
my $valid = 0;
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;
+my @bad;
+if (@bad = BadWords::check($line)) {
+ $self->badcount(($self->badcount||0) + @bad);
+ Log('DXCommand', "$self->{call} swore: $line");
+ $localonly++;
+}
+
# do we have at least two args?
return (1, $self->msg('dx2')) unless @f >= 2;
# do we have at least two args?
return (1, $self->msg('dx2')) unless @f >= 2;
@@
-43,6
+51,7
@@
if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
return (1, $self->msg('dx3'));
}
return (1, $self->msg('dx3'));
}
+
# make line the rest of the line
$line = $f[2] || " ";
@f = split /\s+/, $line;
# make line the rest of the line
$line = $f[2] || " ";
@f = split /\s+/, $line;
@@
-93,14
+102,15
@@
if ($spotted le ' ') {
return (1, @out) unless $valid;
return (1, @out) unless $valid;
-my @bad;
-if (@bad = BadWords::check($line)) {
- $self->badcount(($self->badcount||0) + @bad);
- return (1, $self->msg('e17', @bad));
-}
# Store it here (but only if it isn't baddx)
# Store it here (but only if it isn't baddx)
-if (grep $_ eq $spotted, @DXProt::baddx) {
+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 $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
push @out, $buf;
} else {