#
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;
+return (1, $self->msg('e5')) if $self->remotecmd;
# do we have at least two args?
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+//;
- shift @f;
- shift @f;
+ $line = $f[2];
+ @f = split /\s+/, $line;
return (1, $self->msg('dx2')) unless @f >= 2;
}
} 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;
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) {
- 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 {
- my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
+ 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);
if (@spot) {
+ # store it
+ Spot::add(@spot);
+
# send orf to the users
DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
}
}
return (1, @out);
+
+
+
+
+