put in input filter for ann and output filters for ann/wwv/spots

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 0f802d89f6396a8fd031ea2323a8d41666c3131c..f2ba37454457b2573fc6088be8fa3e0388cf6a2f 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,6 +92,7 @@ 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);
 
        
        $self->send($self->msg('pr', $call));
@@ -129,8 +136,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 +198,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 +224,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");
+                       if ($path && $cmd) {
+                               dbg('command', "path: $cmd cmd: $fcmd");
                        
-                       my $package = find_cmd_name($path, $fcmd);
-                       @ans = (0) if !$package ;
-                       
-                       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);
                        }
                }
        }
@@ -277,7 +307,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;
@@ -467,7 +497,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;
        }
@@ -478,7 +508,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;
@@ -510,7 +542,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;
                }
        }