X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=76bfa9314926046d12ed18a00a3221746f497b82;hb=25140d3e8633cbf9e25b6528248405ec8ed125e3;hp=c03885526a9ed96664d31f75e31a7995eac48bf8;hpb=b735ad9a0325fae9ca0c2324794b99288a737802;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index c0388552..76bfa931 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -31,7 +31,9 @@ use WCY;
 use Sun;
 use Internet;
 use Script;
-
+use Net::Telnet;
+use QSL;
+use DB_File;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount);
@@ -47,7 +49,7 @@ $maxbadcount = 3;				# no of bad words allowed before disconnection
 
 use vars qw($VERSION $BRANCH);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -63,7 +65,10 @@ sub new
 	my $pkg = shift;
 	my $call = shift;
 	my @rout = $main::routeroot->add_user($call, Route::here(1));
-	DXProt::route_pc16($main::me, $main::routeroot, @rout) if @rout;
+
+	# ALWAYS output the user
+	my $ref = Route::User::get($call);
+	$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
 
 	return $self;
 }
@@ -104,6 +109,12 @@ sub start
 	$self->{logininfo} = $user->wantlogininfo;
 	$self->{ann_talk} = $user->wantann_talk;
 	$self->{here} = 1;
+	$self->{prompt} = $user->prompt if $user->prompt;
+
+	# sort out new dx spot stuff
+	$user->wantdxcq(0) unless defined $user->{wantdxcq};
+	$user->wantdxitu(0) unless defined $user->{wantdxitu};	
+	$user->wantusstate(0) unless defined $user->{wantusstate};
 
 	# sort out registration
 	if ($main::reqreg == 1) {
@@ -151,9 +162,9 @@ sub start
 	# do we need to send a forward/opernam?
 	my $lastoper = $user->lastoper || 0;
 	my $homenode = $user->homenode || ""; 
-	if ($homenode eq $main::mycall && $lastoper + $DXUser::lastoperinterval < $main::systime) {
+	if ($homenode eq $main::mycall && $main::systime >= $lastoper + $DXUser::lastoperinterval) {
 		run_cmd($main::me, "forward/opernam $call");
-		$user->lastoper($main::systime);
+		$user->lastoper($main::systime + ((int rand(10)) * 86400));
 	}
 
 	# run a script send the output to the punter
@@ -182,6 +193,9 @@ sub normal
 	my $self = shift;
 	my $cmdline = shift;
 	my @ans;
+
+	# save this for them's that need it
+	my $rawline = $cmdline;
 	
 	# remove leading and trailing spaces
 	$cmdline =~ s/^\s*(.*)\s*$/$1/;
@@ -258,9 +272,24 @@ sub normal
 			}
 			$self->state('prompt');
 			delete $self->{talklist};
-		} elsif ($cmdline =~ m(^/\w+)) {
-			$cmdline =~ s(^/)();
-			$self->send_ans(run_cmd($self, $cmdline));
+		} elsif ($cmdline =~ m|^/+\w+|) {
+			$cmdline =~ s|^/||;
+			my $sendit = $cmdline =~ s|^/+||;
+			my @in = $self->run_cmd($cmdline);
+			$self->send_ans(@in);
+			if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
+				foreach my $l (@in) {
+					my @bad;
+					if (@bad = BadWords::check($l)) {
+						$self->badcount(($self->badcount||0) + @bad);
+						Log('DXCommand', "$self->{call} swore: $l");
+					} else {
+						for (@{$self->{talklist}}) {
+							$self->send_talks($_, $l);
+						}
+					}
+				}
+			}
 			$self->send($self->talk_prompt);
 		} elsif ($self->{talklist} && @{$self->{talklist}}) {
 			# send what has been said to whoever is in this person's talk list
@@ -270,7 +299,7 @@ sub normal
 				Log('DXCommand', "$self->{call} swore: $cmdline");
 			} else {
 				for (@{$self->{talklist}}) {
-					$self->send_talks($_, $cmdline);
+					$self->send_talks($_, $rawline);
 				}
 			}
 			$self->send($self->talk_prompt) if $self->{state} eq 'talk';
@@ -282,9 +311,9 @@ sub normal
 		no strict 'refs';
 		my @ans;
 		if (ref $self->{edit}) {
-			eval { @ans = $self->{edit}->$func($self, $cmdline)};
+			eval { @ans = $self->{edit}->$func($self, $rawline)};
 		} else {
-			eval {	@ans = &{$self->{func}}($self, $cmdline) };
+			eval {	@ans = &{$self->{func}}($self, $rawline) };
 		}
 		if ($@) {
 			$self->send_ans("Syserr: on stored func $self->{func}", $@);
@@ -448,7 +477,7 @@ sub run_cmd
 			return ();
 		}
 	}
-	return (@ans);
+	return map {s/([^\s])\s+$/$1/; $_} @ans;
 }
 
 #
@@ -495,13 +524,13 @@ sub disconnect
 	if ($uref) {
 		@rout = $main::routeroot->del_user($uref);
 		dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
+
+		# issue a pc17 to everybody interested
+		$main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
 	} else {
 		confess "trying to disconnect a non existant user $call";
 	}
 
-	# issue a pc17 to everybody interested
-	DXProt::route_pc17($main::me, $main::routeroot, @rout) if @rout;
-
 	# I was the last node visited
     $self->user->node($main::mycall);
 		
@@ -520,7 +549,11 @@ sub disconnect
 sub prompt
 {
 	my $self = shift;
-	$self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call, cldate($main::systime), ztime($main::systime)));
+	if ($self->{prompt}) {
+		$self->send($self->{prompt});
+	} else {
+		$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]
@@ -620,7 +653,7 @@ sub clear_cmd_cache
 	no strict 'refs';
 	
 	for (keys %Cache) {
-		undef *{$_};
+		undef *{$_} unless /cmd_cache/;
 		dbg("Undefining cmd $_") if isdbg('command');
 	}
 	%cmd_cache = ();
@@ -771,6 +804,26 @@ sub announce
 	$self->local_send($target eq 'WX' ? 'W' : 'N', $buf);
 }
 
+# send a chat
+sub chat
+{
+	my $self = shift;
+	my $line = shift;
+	my $isolate = shift;
+	my $target = shift;
+	my $to = shift;
+	my $text = shift;
+	my ($filter, $hops);
+
+	return unless grep uc $_ eq $target, @{$self->{user}->{group}};
+	
+	$text =~ s/^\#\d+ //;
+	my $buf = "$target de $_[0]: $text";
+	$buf =~ s/\%5E/^/g;
+	$buf .= "\a\a" if $self->{beep};
+	$self->local_send('C', $buf);
+}
+
 # send a dx spot
 sub dx_spot
 {
@@ -786,7 +839,34 @@ sub dx_spot
 		return unless $filter;
 	}
 
-	my $buf = Spot::formatb($self->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
+
+	dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
+	
+	my $t = ztime($_[2]);
+	my $loc;
+	my $clth = $self->{consort} eq 'local' ? 29 : 30;
+	my $comment = substr $_[3], 0, $clth; 
+	$comment .= ' ' x ($clth - length($comment));
+	my $ref = DXUser->get_current($_[4]);
+	if ($ref) {
+		$loc = $ref->qra || '' if $self->{user}->wantgrid; 
+		$loc = ' ' . substr($loc, 0, 4) if $loc;
+	} 
+	$loc = "" unless $loc;
+
+	if ($self->{user}->wantdxitu) {
+		$loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
+		$comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[8]) if defined $_[8]; 
+	} elsif ($self->{user}->wantdxcq) {
+		$loc = ' ' . sprintf("%2d", $_[11]) if defined $_[11];
+		$comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[9]) if defined $_[9]; 
+	} elsif ($self->{user}->wantusstate) {
+		$loc = ' ' . $_[13] if $_[13];
+		$comment = substr($comment, 0,  $self->{consort} eq 'local' ? 26 : 27) . ' ' . $_[12] if $_[12]; 
+	}
+
+	my $buf = sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+	
 	$buf .= "\a\a" if $self->{beep};
 	$buf =~ s/\%5E/^/g;
 	$self->local_send('X', $buf);