X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=6e7a0944f5461c109d9b4a5d6a5106ba2092515b;hb=3b3b52396a19281c24481f0fcf7d216f426f94d9;hp=47e25c0b80c8fc56e96649934c635442f7a02507;hpb=3acdc2b85c646b97ecb7504fb5e982a8b5839455;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 47e25c0b..6e7a0944 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -66,7 +66,7 @@ sub start
 	$self->send_file($main::motd) if (-e $main::motd);
 	$self->state('prompt');		# a bit of room for further expansion, passwords etc
 	$self->{priv} = $user->priv || 0;
-	$self->{lang} = $user->lang || 'en';
+	$self->{lang} = $user->lang || $main::lang || 'en';
 	$self->{pagelth} = $user->pagelth || 20;
 	$self->{priv} = 0 if $line =~ /^(ax|te)/; # set the connection priv to 0 - can be upgraded later
 	$self->{consort} = $line;	# save the connection type
@@ -118,7 +118,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->send($self->msg('pr', $call));
+	$self->prompt;
 
 	# decide on echo
 	if (!$user->wantecho) {
@@ -384,29 +384,20 @@ sub process
 #
 # finish up a user context
 #
-sub finish
+sub disconnect
 {
 	my $self = shift;
-	my $conn = shift;
 	my $call = $self->call;
 
+	# reset the redirection of messages back to 'normal' if we are the sysop
+	if ($call eq $main::myalias) {
+		my $node = DXNode->get($main::mycall) or die "$main::mycall not allocated in DXNode database";
+		$node->dxchan($DXProt::me);
+	}
+
 	# I was the last node visited
     $self->user->node($main::mycall);
 		
-	# log out text
-	if ($conn && -e "$main::data/logout") {
-		open(I, "$main::data/logout") or confess;
-		my @in = <I>;
-		close(I);
-		$self->send_now('D', @in);
-		sleep(1);
-	}
-
-#	if ($call eq $main::myalias) { # unset the channel if it is us really
-#		my $node = DXNode->get($main::mycall);
-#		$node->{dxchan} = 0;
-#	}
-	
 	# issue a pc17 to everybody interested
 	my $nchan = DXChannel->get($main::mycall);
 	my $pc17 = $nchan->pc17($self);
@@ -418,6 +409,8 @@ sub finish
 	Log('DXCommand', "$call disconnected");
 	my $ref = DXCluster->get_exact($call);
 	$ref->del() if $ref;
+
+	$self->SUPER::disconnect;
 }
 
 #
@@ -427,7 +420,7 @@ sub finish
 sub prompt
 {
 	my $self = shift;
-	$self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call));
+	$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]