X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=9b3b09e3f4e24572f5ee5e45462c09eff0d41346;hb=a9072bdb10a67ad28edda787cbf38018356b2db5;hp=1004544255610b92df8beea126e2ec90f4caa37d;hpb=aad4e36d3753bf8dde671d14d73b1d9785b9ff41;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 10045442..9b3b09e3 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -35,6 +35,10 @@ use Net::Telnet;
 use QSL;
 use DB_File;
 use VE7CC;
+use Thingy;
+use Thingy::Dx;
+use Thingy::Hello;
+use Thingy::Bye;
 
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount $msgpolltime);
@@ -50,10 +54,8 @@ $msgpolltime = 3600;			# the time between polls for new messages
 
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 #
 # obtain a new connection this is derived from dxchannel
@@ -66,12 +68,11 @@ sub new
 	# routing, this must go out here to prevent race condx
 	my $pkg = shift;
 	my $call = shift;
-	my @rout = $main::routeroot->add_user($call, Route::here(1));
+	my @rout = $main::routeroot->add_user($call, 1);
 
-	# ALWAYS output the user
+	
 	my $ref = Route::User::get($call);
 	$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
-
 	return $self;
 }
 
@@ -129,7 +130,12 @@ sub start
 
 
 	# decide which motd to send
-	my $motd = "${main::motd}_nor" unless $self->{registered};
+	my $motd;
+	unless ($self->{registered}) {
+		$motd = "${main::motd}_nor_$self->{lang}";
+		$motd = "${main::motd}_nor" unless -e $motd;
+	}
+	$motd = "${main::motd}_$self->{lang}" unless $motd && -e $motd;
 	$motd = $main::motd unless $motd && -e $motd;
 	$self->send_file($motd) if -e $motd;
 
@@ -169,6 +175,11 @@ sub start
 		$user->lastoper($main::systime + ((int rand(10)) * 86400));
 	}
 
+	# ALWAYS output the user
+	my $thing = Thingy::Hello->new(user => $call, h => $self->{here});
+	$thing->broadcast($self);
+	$self->lasthello($main::systime);
+
 	# run a script send the output to the punter
 	my $script = new Script(lc $call) || new Script('user_default');
 	$script->run($self) if $script;
@@ -489,7 +500,7 @@ sub run_cmd
 sub process
 {
 	my $t = time;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	
 	foreach $dxchan (@dxchan) {
@@ -535,6 +546,9 @@ sub disconnect
 
 		# issue a pc17 to everybody interested
 		$main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
+
+		my $thing = Thingy::Bye->new(user=>$call);
+		$thing->broadcast($self);
 	} else {
 		confess "trying to disconnect a non existant user $call";
 	}
@@ -545,6 +559,9 @@ sub disconnect
 	# send info to all logged in thingies
 	$self->tell_login('logoutu');
 
+	# remove any outstanding pings I have sent
+	Thingy::Ping::forget($call);
+	
 	Log('DXCommand', "$call disconnected");
 
 	$self->SUPER::disconnect;
@@ -577,7 +594,7 @@ sub broadcast
 	my $pkg = shift;			# ignored
 	my $s = shift;				# the line to be rebroadcast
 	
-    foreach my $dxchan (DXChannel->get_all()) {
+    foreach my $dxchan (DXChannel::get_all()) {
 		next unless $dxchan->{sort} eq 'U'; # only interested in user channels  
 		next if grep $dxchan == $_, @_;
 		$dxchan->send($s);			# send it
@@ -587,7 +604,7 @@ sub broadcast
 # gimme all the users
 sub get_all
 {
-	return grep {$_->{sort} eq 'U'} DXChannel->get_all();
+	return grep {$_->{sort} eq 'U'} DXChannel::get_all();
 }
 
 # run a script for this user
@@ -839,65 +856,6 @@ sub chat
 	$self->local_send('C', $buf);
 }
 
-sub format_dx_spot
-{
-	my $self = shift;
-
-	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));
-	if ($self->{user}->wantgrid) { 
-		my $ref = DXUser->get_current($_[4]);
-		if ($ref) {
-			$loc = $ref->qra || '';
-			$loc = ' ' . substr($loc, 0, 4) if $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]; 
-	}
-
-	return sprintf "DX de %-7.7s%11.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
-}
-
-# send a dx spot
-sub dx_spot
-{
-	my $self = shift;
-	my $line = shift;
-	my $isolate = shift;
-	return unless $self->{dx};
-
-	my ($filter, $hops);
-
-	if ($self->{spotsfilter}) {
-		($filter, $hops) = $self->{spotsfilter}->it(@_ );
-		return unless $filter;
-	}
-
-	dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
-
-	my $buf;
-	if ($self->{ve7cc}) {
-		$buf = VE7CC::dx_spot($self, @_);
-	} else {
-		$buf = $self->format_dx_spot(@_);
-		$buf .= "\a\a" if $self->{beep};
-		$buf =~ s/\%5E/^/g;
-	}
-
-	$self->local_send('X', $buf);
-}
 
 sub wwv
 {
@@ -942,12 +900,60 @@ sub broadcast_debug
 {
 	my $s = shift;				# the line to be rebroadcast
 	
-	foreach my $dxchan (DXChannel->get_all) {
+	foreach my $dxchan (DXChannel::get_all) {
 		next unless $dxchan->{enhanced} && $dxchan->{senddbg};
 		$dxchan->send_later('L', $s);
 	}
 }
 
+sub do_entry_stuff
+{
+	my $self = shift;
+	my $line = shift;
+	my @out;
+	
+	if ($self->state eq 'enterbody') {
+		my $loc = $self->{loc} || confess "local var gone missing" ;
+		if ($line eq "\032" || $line eq '%1A' || uc $line eq "/EX") {
+			no strict 'refs';
+			push @out, &{$loc->{endaction}}($self);          # like this for < 5.8.0
+			$self->func(undef);
+			$self->state('prompt');
+		} elsif ($line eq "\031" || uc $line eq "/ABORT" || uc $line eq "/QUIT") {
+			push @out, $self->msg('m10');
+			delete $loc->{lines};
+			delete $self->{loc};
+			$self->func(undef);
+			$self->state('prompt');
+		} else {
+			push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
+			# i.e. it ain't and end or abort, therefore store the line
+		}
+	} else {
+		confess "Invalid state $self->{state}";
+	}
+	return @out;
+}
+
+sub store_startup_script
+{
+	my $self = shift;
+	my $loc = $self->{loc} || confess "local var gone missing" ;
+	my @out;
+	my $call = $loc->{call} || confess "callsign gone missing";
+	confess "lines array gone missing" unless ref $loc->{lines};
+	my $r = Script::store($call, $loc->{lines});
+	if (defined $r) {
+		if ($r) {
+			push @out, $self->msg('m19', $call, $r);
+		} else {
+			push @out, $self->msg('m20', $call);
+		}
+	} else {
+		push @out, "error opening startup script $call $!";
+	} 
+	return @out;
+}
 
 1;
 __END__