X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=f2ba37454457b2573fc6088be8fa3e0388cf6a2f;hb=82de56e409a19a05761794c9588713160b51144e;hp=bce0255fd4750002963821575ccd462f5173ddda;hpb=8942c27356acc5d5f5a20134461bcf7e6bd6a044;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index bce0255f..f2ba3745 100644
--- 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,9 +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);
@@ -77,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
@@ -87,10 +92,8 @@ 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('msgnew')) if DXMsg::for_me($call);
+	$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));
 }
@@ -133,6 +136,22 @@ 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;
 		
@@ -288,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;
@@ -491,7 +510,7 @@ sub find_cmd_name {
 	} else {
 		delete_package($package) if defined $Cache{$package}{mtime};
 		
-		my $fh = new FileHandle;
+		my $fh = new IO::File;
 		if (!open $fh, $filename) {
 			$errstr = "Syserr: can't open '$filename' $!";
 			return undef;