X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=7371a8690ab781391150847d33b86d02747d0a9e;hb=5764cc1c0f79b56fdf5389d2b0dcb2ab7e54723d;hp=5c3699a38190c25f37b6c9d168e6d58ec83080a3;hpb=080b937d5e6d083879e9df1dd70def745efd8839;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 5c3699a3..7371a869 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -35,9 +35,11 @@ use Net::Telnet;
 use QSL;
 use DB_File;
 use VE7CC;
+use Thingy;
+use Thingy::Dx;
 
 use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount);
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount $msgpolltime);
 
 %Cache = ();					# cache of dynamically loaded routine's mod times
 %cmd_cache = ();				# cache of short names
@@ -46,11 +48,12 @@ $errstr = ();					# error string from eval
 $scriptbase = "$main::root/scripts"; # the place where all users start scripts go
 $maxerrors = 20;				# the maximum number of concurrent errors allowed before disconnection
 $maxbadcount = 3;				# no of bad words allowed before disconnection
+$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));
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))?$/  || (0,0));
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -128,7 +131,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;
 
@@ -182,6 +190,7 @@ sub start
 	$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->lastmsgpoll($main::systime);
 	$self->prompt;
 }
 
@@ -492,6 +501,12 @@ sub process
 	
 	foreach $dxchan (@dxchan) {
 		next if $dxchan->sort ne 'U';  
+	
+		# send a outstanding message prompt if required
+		if ($t >= $dxchan->lastmsgpoll + $msgpolltime) {
+			$dxchan->send($dxchan->msg('m9')) if DXMsg::for_me($dxchan->call);
+			$dxchan->lastmsgpoll($t);
+		}
 		
 		# send a prompt if no activity out on this channel
 		if ($t >= $dxchan->t + $main::user_interval) {
@@ -549,11 +564,18 @@ sub disconnect
 sub prompt
 {
 	my $self = shift;
-	if ($self->{prompt}) {
-		$self->send($self->{prompt});
-	} else {
-		$self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call, cldate($main::systime), ztime($main::systime)));
-	}
+	my $call = $self->call;
+	my $date = cldate($main::systime);
+	my $time = ztime($main::systime);
+	my $prompt = $self->{prompt} || $self->msg('pr');
+
+	$call = "($call)" unless $self->here;
+	$prompt =~ s/\%C/$call/g;
+	$prompt =~ s/\%D/$date/g;
+	$prompt =~ s/\%T/$time/g;
+	$prompt =~ s/\%M/$main::mycall/g;
+	
+	$self->send($prompt);
 }
 
 # broadcast a message to all users [except those mentioned after buffer]
@@ -824,64 +846,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));
-	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]; 
-	}
-
-	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
 {
@@ -932,6 +896,54 @@ sub broadcast_debug
 	}
 }
 
+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__