use Sun;
use Internet;
use Script;
-
+use Net::Telnet;
+use QSL;
+use DB_File;
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount);
# ALWAYS output the user
my $ref = Route::User::get($call);
- DXProt::route_pc16($main::me, $main::routeroot, $ref) if $ref;
+ $main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
return $self;
}
$self->{here} = 1;
$self->{prompt} = $user->prompt if $user->prompt;
+ # sort out new dx spot stuff
+ $user->wantdxcq(0) unless defined $user->{wantdxcq};
+ $user->wantdxitu(0) unless defined $user->{wantdxitu};
+ $user->wantusstate(0) unless defined $user->{wantusstate};
+
# sort out registration
if ($main::reqreg == 1) {
$self->{registered} = $user->registered;
return () if length $cmdline == 0;
- # strip out //
- $cmdline =~ s|//|/|og;
-
# split the command line up into parts, the first part is the command
my ($cmd, $args) = split /\s+/, $cmdline, 2;
$args = "" unless defined $args;
if ($cmd) {
-
+ # strip out // on command only
+ $cmd =~ s|//|/|g;
+
my ($path, $fcmd);
dbg("cmd: $cmd") if isdbg('command');
dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
# issue a pc17 to everybody interested
- DXProt::route_pc17($main::me, $main::routeroot, $uref);
+ $main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
} else {
confess "trying to disconnect a non existant user $call";
}
$self->local_send($target eq 'WX' ? 'W' : 'N', $buf);
}
-# send a dx spot
-sub dx_spot
+# send a chat
+sub chat
{
my $self = shift;
my $line = shift;
my $isolate = shift;
+ my $target = shift;
+ my $to = shift;
+ my $text = shift;
my ($filter, $hops);
- return unless $self->{dx};
+ return unless grep uc $_ eq $target, @{$self->{user}->{group}};
- if ($self->{spotsfilter}) {
- ($filter, $hops) = $self->{spotsfilter}->it(@_ );
- return unless $filter;
- }
+ $text =~ s/^\#\d+ //;
+ my $buf = "$target de $_[0]: $text";
+ $buf =~ s/\%5E/^/g;
+ $buf .= "\a\a" if $self->{beep};
+ $self->local_send('C', $buf);
+}
+sub format_dx_spot
+{
+ my $self = shift;
my $t = ztime($_[2]);
my $loc;
}
$loc = "" unless $loc;
- # USDB stuff
- if ($USDB::present && $self->{user}->wantusstate) {
- my ($city, $state) = USDB::get($_[4]);
- if ($state) {
- $loc = ' ' . $state;
- }
- ($city, $state) = USDB::get($_[1]);
- if ($state) {
- $comment = substr($comment, 0, $self->{consort} eq 'local' ? 26 : 27) . ' ' . $state;
- }
+ if ($self->{user}->wantdxitu) {
+ $loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
+ $comment = substr($comment, 0, $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[8]) if defined $_[8];
+ } elsif ($self->{user}->wantdxcq) {
+ $loc = ' ' . sprintf("%2d", $_[11]) if defined $_[11];
+ $comment = substr($comment, 0, $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[9]) if defined $_[9];
+ } elsif ($self->{user}->wantusstate) {
+ $loc = ' ' . $_[13] if $_[13];
+ $comment = substr($comment, 0, $self->{consort} eq 'local' ? 26 : 27) . ' ' . $_[12] if $_[12];
+ }
+
+ return sprintf "DX de %-7.7s%11.1f %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+}
+
+# send a dx spot
+sub dx_spot
+{
+ my $self = shift;
+ my $line = shift;
+ my $isolate = shift;
+ my ($filter, $hops);
+
+ return unless $self->{dx};
+
+ if ($self->{spotsfilter}) {
+ ($filter, $hops) = $self->{spotsfilter}->it(@_ );
+ return unless $filter;
}
- my $buf = sprintf "DX de %-7.7s%11.1f %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+ dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
+ my $buf = $self->format_dx_spot(@_);
$buf .= "\a\a" if $self->{beep};
$buf =~ s/\%5E/^/g;
$self->local_send('X', $buf);