projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added Steve K9AN's sh/moon stuff
[spider.git]
/
cmd
/
dx.pl
diff --git
a/cmd/dx.pl
b/cmd/dx.pl
index a4ea8464b8a807b669e58ce4d7a31429221142bb..3876ff1f643228248b7c65a2cd79812cebb88994 100644
(file)
--- a/
cmd/dx.pl
+++ b/
cmd/dx.pl
@@
-15,7
+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;
+return (1, $self->msg('e28')) unless $self->registered;
+
+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;
@@
-33,16
+42,17
@@
if ($f[0] =~ /^by$/i) {
}
# get the freq and callsign either way round
}
# get the freq and callsign either way round
-if (
$f[0] =~ /[A-Za-z]/
) {
+if (
is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}
) {
$spotted = uc $f[0];
$freq = $f[1];
$spotted = uc $f[0];
$freq = $f[1];
-} elsif (
$f[0] =~ /^[0-9\.\,]+$/
) {
+} elsif (
is_freq($f[0]) && $f[1] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}
) {
$freq = $f[0];
$spotted = uc $f[1];
} else {
$freq = $f[0];
$spotted = uc $f[1];
} else {
- return (1, $self->msg('dx
2
'));
+ return (1, $self->msg('dx
3
'));
}
}
+
# 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,13
+103,15
@@
if ($spotted le ' ') {
return (1, @out) unless $valid;
return (1, @out) unless $valid;
-my @bad;
-if (@bad = BadWords::check($line)) {
- 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 {