Fixed console to wrap.

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 1450a6c644cccaa3eb214a26d3e393b1102e0fa0..44c2728c3c505b18242c7d5fb41468c015ba6a47 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -9,6 +9,9 @@
 
 package DXCommandmode;
 
+use POSIX;
+use IO::File;
+
 @ISA = qw(DXChannel);
 
 use DXUtil;
@@ -21,8 +24,9 @@ use DXLog;
 use DXLogPrint;
 use DXBearing;
 use CmdAlias;
-use FileHandle;
+use Filter;
 use Carp;
+use Minimuf;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases);
@@ -65,7 +69,7 @@ sub start
        $self->{consort} = $line;       # save the connection type
        
        # set some necessary flags on the user if they are connecting
-       $self->{beep} = $self->{wwv} = $self->{talk} = $self->{ann} = $self->{here} = $self->{dx} = 1;
+       $self->{beep} = $self->{wwv} = $self->{wx} = $self->{talk} = $self->{ann} = $self->{here} = $self->{dx} = 1;
        #  $self->prompt() if $self->{state} =~ /^prompt/o;
        
        # add yourself to the database
@@ -76,7 +80,9 @@ sub start
        # issue a pc16 to everybody interested
        my $nchan = DXChannel->get($main::mycall);
        my @pc16 = DXProt::pc16($nchan, $cuser);
-       DXProt::broadcast_ak1a(@pc16);
+       for (@pc16) {
+               DXProt::broadcast_all_ak1a($_);
+       }
        Log('DXCommand', "$call connected");
        
        # send prompts and things
@@ -86,7 +92,10 @@ sub start
        $self->send($self->msg('qthe1')) if !$user->qth;
        $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);
 
+       # get the filters
+       $self->{spotfilter} = Filter::read_in('spots', $call);
        
        $self->send($self->msg('pr', $call));
 }
@@ -129,8 +138,24 @@ sub normal
                } else {
                        $self->state('prompt');
                }
+       } elsif ($self->{state} eq 'sysop') {
+               my $passwd = $self->{user}->passwd;
+               my @pw = split / */, $passwd;
+               if ($passwd) {
+                       my @l = @{$self->{passwd}};
+                       my $str = "$pw[$l[0]].*$pw[$l[1]].*$pw[$l[2]].*$pw[$l[3]].*$pw[$l[4]]";
+                       if ($cmdline =~ /$str/) {
+                               $self->{priv} = $self->{user}->priv;
+                       } else {
+                               $self->send($self->msg('sorry'));
+                       }
+               } else {
+                       $self->send($self->msg('sorry'));
+               }
+               delete $self->{passwd};
+               $self->state('prompt');
        } else {
-               @ans = run_cmd($self, $cmdline) if length $cmdline;
+               @ans = run_cmd($self, $cmdline);           # if length $cmdline;
                
                if ($self->{pagelth} && @ans > $self->{pagelth}) {
                        my $i;
@@ -175,6 +200,8 @@ sub run_cmd
                        return (1, "Syserr: Eval err $errstr on stored func $self->{func}");
                }
        } else {
+
+               return () if length $cmdline == 0;
                
                # strip out //
                $cmdline =~ s|//|/|og;
@@ -199,20 +226,25 @@ sub run_cmd
                        ($path, $fcmd) = search($main::localcmd, $cmd, "pl");
                        ($path, $fcmd) = search($main::cmd, $cmd, "pl") if !$path || !$fcmd;
 
-                       dbg('command', "path: $cmd cmd: $fcmd");
-                       
-                       my $package = find_cmd_name($path, $fcmd);
-                       @ans = (0) if !$package ;
+                       if ($path && $cmd) {
+                               dbg('command', "path: $cmd cmd: $fcmd");
                        
-                       if ($package) {
-                               dbg('command', "package: $package");
+                               my $package = find_cmd_name($path, $fcmd);
+                               @ans = (0) if !$package ;
                                
-                               my $c = qq{ \@ans = $package(\$self, \$args) };
-                               dbg('eval', "cluster cmd = $c\n");
-                               eval  $c;
-                               if ($@) {
-                                       @ans = (0, "Syserr: Eval err cached $package\n$@");
+                               if ($package) {
+                                       dbg('command', "package: $package");
+                                       
+                                       my $c = qq{ \@ans = $package(\$self, \$args) };
+                                       dbg('eval', "cluster cmd = $c\n");
+                                       eval  $c;
+                                       if ($@) {
+                                               @ans = (0, "Syserr: Eval err cached $package\n$@");
+                                       }
                                }
+                       } else {
+                               dbg('command', "cmd: $cmd not found");
+                               @ans = (0);
                        }
                }
        }
@@ -264,7 +296,8 @@ sub finish
                open(I, "$main::data/logout") or confess;
                my @in = <I>;
                close(I);
-               $self->sendnow('D', @in);
+               $self->send_now('D', @in);
+               sleep(1);
        }
 
        if ($call eq $main::myalias) { # unset the channel if it is us really
@@ -276,7 +309,7 @@ sub finish
        # issue a pc17 to everybody interested
        my $nchan = DXChannel->get($main::mycall);
        my $pc17 = $nchan->pc17($self);
-       DXProt::broadcast_ak1a($pc17);
+       DXProt::broadcast_all_ak1a($pc17);
        
        Log('DXCommand', "$call disconnected");
        $ref->del() if $ref;
@@ -289,9 +322,7 @@ sub finish
 sub prompt
 {
        my $self = shift;
-       my $call = $self->{call};
-       $self->send($self->msg('pr', $call));
-       #DXChannel::msg($self, 'pr', $call);
+       $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call));
 }
 
 # broadcast a message to all users [except those mentioned after buffer]
@@ -468,7 +499,7 @@ sub find_cmd_name {
        
        # return if we can't find it
        $errstr = undef;
-       if (undef $mtime) {
+       unless (defined $mtime) {
                $errstr = DXM::msg('e1');
                return undef;
        }
@@ -479,7 +510,9 @@ sub find_cmd_name {
                #print STDERR "already compiled $package->handler\n";
                ;
        } else {
-               my $fh = new FileHandle;
+               delete_package($package) if defined $Cache{$package}{mtime};
+               
+               my $fh = new IO::File;
                if (!open $fh, $filename) {
                        $errstr = "Syserr: can't open '$filename' $!";
                        return undef;
@@ -489,11 +522,7 @@ sub find_cmd_name {
                close $fh;
                
                #wrap the code into a subroutine inside our unique package
-               my $eval = qq{ 
-                       sub $package 
-                       { 
-                        $sub 
-                       } };
+               my $eval = qq{ sub $package { $sub } };
                
                if (isdbg('eval')) {
                        my @list = split /\n/, $eval;
@@ -515,7 +544,7 @@ sub find_cmd_name {
                        delete_package($package);
                } else {
                        #cache it unless we're cleaning out each time
-                       $Cache{$package}{mtime} = $mtime;
+                       $Cache{$package}{'mtime'} = $mtime;
                }
        }