X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=35fd35cc5fc4b510f3acc70675616dcb168c9b36;hb=d9db74c1b2b9b57cb6d31e8c8c425f3636f62f87;hp=de59160663c080356a11a354c5a52b098f0f3ea1;hpb=f3adc82a0299652d929b73c718127fa38571eec5;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index de591606..35fd35cc 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -21,7 +21,8 @@ use DXLog;
 use DXLogPrint;
 use DXBearing;
 use CmdAlias;
-use FileHandle;
+use IO::File;
+use Filter;
 use Carp;
 
 use strict;
@@ -65,7 +66,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 +77,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 +89,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 +135,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 +197,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;
@@ -282,7 +306,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;
@@ -485,7 +509,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;