my $localonly;
my $oline = $line;
+#$DB::single=1;
+
return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
-return (1, $self->msg('e28')) unless $self->registered;
+return (1, $self->msg('e28')) unless $self->isregistered;
my @bad;
if (@bad = BadWords::check($line)) {
my $addr = $self->hostname;
if ($self->conn && $self->conn->peerhost) {
- $ipaddr = $addr unless !is_ipaddr($addr) || $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
+# $ipaddr = $addr unless !is_ipaddr($addr) || $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
+ $ipaddr = $addr; # force a PC61
} elsif ($self->inscript) {
$ipaddr = "script";
}
return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line, $spotter);
my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall, $ipaddr);
+#$DB::single = 1;
+
if ($freq =~ /^69/ || $localonly) {
# heaven forfend that we get a 69Mhz band :-)
}
$self->dx_spot(undef, undef, @spot);
+
return (1);
} else {
- if (@spot) {
- # store it
- Spot::add(@spot);
-
# send orf to the users
- my $spot;
-
- if ($ipaddr) {
- $spot = DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr);
- } else {
- $spot = DXProt::pc11($spotter, $freq, $spotted, $line);
- }
+ my $spot;
+ if ($ipaddr) {
+ $spot = DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr);
+ }
+ #else {
+ # $spot = DXProt::pc11($spotter, $freq, $spotted, $line);
+ #}
+
+ $self->dx_spot(undef, undef, @spot);
+ if ($self->isslugged) {
+ push @{$self->{sluggedpcs}}, [61, $spot, \@spot];
+ } else {
+ # store in spots database
+ Spot::add(@spot);
DXProt::send_dx_spot($self, $spot, @spot);
}
}