projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed DX and RT from groups
[spider.git]
/
cmd
/
dx.pl
diff --git
a/cmd/dx.pl
b/cmd/dx.pl
index a7dc99ada65910c810fb45b8d31cb339de175067..9a9aff7108a2c58b0b9f079702d4650effd5b982 100644
(file)
--- a/
cmd/dx.pl
+++ b/
cmd/dx.pl
@@
-16,7
+16,7
@@
my $freq;
my @out;
my $valid = 0;
my $localonly;
my @out;
my $valid = 0;
my $localonly;
-return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e5')) if $self->remotecmd
|| $self->inscript
;
return (1, $self->msg('e28')) unless $self->registered;
my @bad;
return (1, $self->msg('e28')) unless $self->registered;
my @bad;
@@
-34,10
+34,11
@@
return (1, $self->msg('dx2')) unless @f >= 2;
# can be in any order
if ($f[0] =~ /^by$/i) {
# can be in any order
if ($f[0] =~ /^by$/i) {
+ return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv;
$spotter = uc $f[1];
$spotter = uc $f[1];
- $line =~ s/
^
\s*$f[0]\s+$f[1]\s+//;
-
$line = $f[2];
- @f = split /\s+/, $line;
+ $line =~ s/\s*$f[0]\s+$f[1]\s+//;
+
#
$line = $f[2];
+ @f = split /\s+/, $line
, 3
;
return (1, $self->msg('dx2')) unless @f >= 2;
}
return (1, $self->msg('dx2')) unless @f >= 2;
}
@@
-103,8
+104,9
@@
return (1, @out) unless $valid;
# Store it here (but only if it isn't baddx)
my $t = (int ($main::systime/60)) * 60;
# Store it here (but only if it isn't baddx)
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);
my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall);
+my $thing = Thingy::Dx->new(origin=>$main::mycall, group=>'DX', user=>$spotter);
+$thing->from_DXProt(spotdata=>\@spot);
if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
@@
-112,19
+114,10
@@
if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
if ($freq =~ /^69/) {
$self->badcount(($self->badcount||0) + 1);
}
if ($freq =~ /^69/) {
$self->badcount(($self->badcount||0) + 1);
}
-
- $self->dx_spot(undef, undef, @spot);
- return (1);
} else {
} else {
- if (@spot) {
- # store it
- Spot::add(@spot);
-
- # send orf to the users
- DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
- }
+ $thing->queue($self);
}
}
-
+push @out, $thing->gen_DXCommandmode($self);
return (1, @out);
return (1, @out);