do non blocking connects

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 4eca6e74abfc930b6c7408bc5d453be1f2e7b2b2..aea2064e615b3754bfb6ec849428211455702d94 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -29,6 +29,7 @@ use DXDb;
 use AnnTalk;
 use WCY;
 use Sun;
+use Internet;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase);
@@ -65,7 +66,7 @@ sub start
        $self->send_file($main::motd) if (-e $main::motd);
        $self->state('prompt');         # a bit of room for further expansion, passwords etc
        $self->{priv} = $user->priv || 0;
-       $self->{lang} = $user->lang || 'en';
+       $self->{lang} = $user->lang || $main::lang || 'en';
        $self->{pagelth} = $user->pagelth || 20;
        $self->{priv} = 0 if $line =~ /^(ax|te)/; # set the connection priv to 0 - can be upgraded later
        $self->{consort} = $line;       # save the connection type
@@ -81,6 +82,12 @@ sub start
        $self->{logininfo} = $user->wantlogininfo;
        $self->{here} = 1;
 
+       # get the filters
+       $self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'user_default', 0);
+       $self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'user_default', 0);
+       $self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'user_default', 0);
+       $self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'user_default', 0) ;
+
        # clean up qra locators
        my $qra = $user->qra;
        $qra = undef if ($qra && !DXBearing::is_qra($qra));
@@ -111,7 +118,7 @@ sub start
        $self->send($self->msg('qll')) if !$user->qra || (!$user->lat && !$user->long);
        $self->send($self->msg('hnodee1')) if !$user->qth;
        $self->send($self->msg('m9')) if DXMsg::for_me($call);
-       $self->send($self->msg('pr', $call));
+       $self->prompt;
 
        # decide on echo
        if (!$user->wantecho) {
@@ -258,7 +265,7 @@ sub send_ans
                        $line =~ s/\s+$//o;     # why am having to do this? 
                        $self->send($line);
                }
-               $self->{pagedata} =  \@_;
+               $self->{pagedata} =  [ @_ ];
                $self->state('page');
                $self->send($self->msg('page', scalar @_));
        } else {
@@ -296,7 +303,7 @@ sub run_cmd
                
                # split the command line up into parts, the first part is the command
                my ($cmd, $args) = split /\s+/, $cmdline, 2;
-               $args = "" unless $args;
+               $args = "" unless defined $args;
                
                if ($cmd) {
                        
@@ -308,7 +315,7 @@ sub run_cmd
                        my $acmd = CmdAlias::get_cmd($cmd);
                        if ($acmd) {
                                ($cmd, $args) = split /\s+/, "$acmd $args", 2;
-                               $args = "" unless $args;
+                               $args = "" unless defined $args;
                                dbg('command', "aliased cmd: $cmd $args");
                        }
                        
@@ -380,26 +387,17 @@ sub process
 sub finish
 {
        my $self = shift;
-       my $conn = shift;
        my $call = $self->call;
 
+       # reset the redirection of messages back to 'normal' if we are the sysop
+       if ($call eq $main::myalias) {
+               my $node = DXNode->get($main::mycall) or die "$main::mycall not allocated in DXNode database";
+               $node->dxchan($DXProt::me);
+       }
+
        # I was the last node visited
     $self->user->node($main::mycall);
                
-       # log out text
-       if ($conn && -e "$main::data/logout") {
-               open(I, "$main::data/logout") or confess;
-               my @in = <I>;
-               close(I);
-               $self->send_now('D', @in);
-               sleep(1);
-       }
-
-       if ($call eq $main::myalias) { # unset the channel if it is us really
-               my $node = DXNode->get($main::mycall);
-               $node->{dxchan} = 0;
-       }
-       
        # issue a pc17 to everybody interested
        my $nchan = DXChannel->get($main::mycall);
        my $pc17 = $nchan->pc17($self);
@@ -420,7 +418,7 @@ sub finish
 sub prompt
 {
        my $self = shift;
-       $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call));
+       $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call, cldate($main::systime), ztime($main::systime)));
 }
 
 # broadcast a message to all users [except those mentioned after buffer]
@@ -630,7 +628,7 @@ sub talk
 {
        my ($self, $from, $to, $via, $line) = @_;
        $line =~ s/\\5E/\^/g;
-       $self->send("$to de $from $line") if $self->{talk};
+       $self->send("$to de $from: $line") if $self->{talk};
        Log('talk', $to, $from, $main::mycall, $line);
 }