change the placing of adding PC9x headers

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 5f8256e93d1ff449b39c9ad62ee99903735c6b88..2d2b5deff1560759dc0b9c13be685e52ab30fdb4 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -32,6 +32,8 @@ 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);
@@ -66,7 +68,7 @@ sub new
 
        # 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;
 }
@@ -109,6 +111,11 @@ sub start
        $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;
@@ -519,7 +526,7 @@ sub disconnect
                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";
        }
@@ -545,7 +552,10 @@ sub prompt
        if ($self->{prompt}) {
                $self->send($self->{prompt});
        } else {
-               $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call, cldate($main::systime), ztime($main::systime)));
+               my $prkey = $self->here ? 'pr' : 'pr2';
+               my $mail = DXMsg::for_me($self->call) ? $self->msg('newmail') : "";
+               
+               $self->send($self->msg($prkey, $self->call, cldate($main::systime), ztime($main::systime), $mail));
        }
 }
 
@@ -797,6 +807,26 @@ sub announce
        $self->local_send($target eq 'WX' ? 'W' : 'N', $buf);
 }
 
+# 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 grep uc $_ eq $target, @{$self->{user}->{group}};
+       
+       $text =~ s/^\#\d+ //;
+       my $buf = "$target de $_[0]: $text";
+       $buf =~ s/\%5E/^/g;
+       $buf .= "\a\a" if $self->{beep};
+       $self->local_send('C', $buf);
+}
+
 # send a dx spot
 sub dx_spot
 {