projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed client.pl
[spider.git]
/
cmd
/
dx.pl
diff --git
a/cmd/dx.pl
b/cmd/dx.pl
index 98338ec60986b731439d610605fe82e58f0368c1..3f366dffb20f82ef5bb508c370b55f836066ce9e 100644
(file)
--- a/
cmd/dx.pl
+++ b/
cmd/dx.pl
@@
-9,12
+9,13
@@
#
my ($self, $line) = @_;
#
my ($self, $line) = @_;
-my @f = split /\s+/, $line;
+my @f = split /\s+/, $line
, 3
;
my $spotter = $self->call;
my $spotted;
my $freq;
my @out;
my $valid = 0;
my $spotter = $self->call;
my $spotted;
my $freq;
my @out;
my $valid = 0;
+return (1, $self->msg('e5')) if $self->remotecmd;
# 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;
@@
-26,8
+27,8
@@
return (1, $self->msg('dx2')) unless @f >= 2;
if ($f[0] =~ /^by$/i) {
$spotter = uc $f[1];
$line =~ s/^\s*$f[0]\s+$f[1]\s+//;
if ($f[0] =~ /^by$/i) {
$spotter = uc $f[1];
$line =~ s/^\s*$f[0]\s+$f[1]\s+//;
-
shift @f
;
-
shift @f
;
+
$line = $f[2]
;
+
@f = split /\s+/, $line
;
return (1, $self->msg('dx2')) unless @f >= 2;
}
return (1, $self->msg('dx2')) unless @f >= 2;
}
@@
-41,7
+42,10
@@
if ($f[0] =~ /[A-Za-z]/) {
} else {
return (1, $self->msg('dx2'));
}
} else {
return (1, $self->msg('dx2'));
}
-$line =~ s/^$f[0]\s+$f[1]\s*//;
+
+# make line the rest of the line
+$line = $f[2] || " ";
+@f = split /\s+/, $line;
# bash down the list of bands until a valid one is reached
my $bandref;
# bash down the list of bands until a valid one is reached
my $bandref;
@@
-89,14
+93,17
@@
if ($spotted le ' ') {
return (1, @out) unless $valid;
return (1, @out) unless $valid;
-# change ^ into : for transmission
-$line =~ s/\^/:/og;
+my @bad;
+if (@bad = BadWords::check($line)) {
+ return (1, $self->msg('e17', @bad));
+}
# Store it here (but only if it isn't baddx)
if (grep $_ eq $spotted, @DXProt::baddx) {
# Store it here (but only if it isn't baddx)
if (grep $_ eq $spotted, @DXProt::baddx) {
- my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter);
+ my $buf = Spot::formatb($
self->user->wantgrid, $
freq, $spotted, $main::systime, $line, $spotter);
push @out, $buf;
} else {
push @out, $buf;
} else {
+ return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, (int ($main::systime/60)) * 60, $line);
my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
if (@spot) {
# send orf to the users
my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
if (@spot) {
# send orf to the users
@@
-105,3
+112,8
@@
if (grep $_ eq $spotted, @DXProt::baddx) {
}
return (1, @out);
}
return (1, @out);
+
+
+
+
+