projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finally fixed the regexes
[spider.git]
/
cmd
/
dx.pl
diff --git
a/cmd/dx.pl
b/cmd/dx.pl
index c7161b62b7887c99d232362b1249e61ad6c0060c..1d09a4769f489744b4c31192c47a8554952203a8 100644
(file)
--- a/
cmd/dx.pl
+++ b/
cmd/dx.pl
@@
-17,6
+17,12
@@
my @out;
my $valid = 0;
return (1, $self->msg('e5')) if $self->remotecmd;
my $valid = 0;
return (1, $self->msg('e5')) if $self->remotecmd;
+my @bad;
+if (@bad = BadWords::check($line)) {
+ $self->badcount(($self->badcount||0) + @bad);
+ return (1, $self->msg('e17', @bad));
+}
+
# 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;
@@
-93,14
+99,9
@@
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)
) {
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 {