X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=b89e1d3c7f540a8bcbc52e735c47742a317946d9;hb=3b7aa32ea996597d0e164197b06fe181a846dbf6;hp=13943472ca462ec70c2f7f23448ae560a5295730;hpb=1a9286080b21d5b65f97cab08d8a493abafad8f1;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 13943472..b89e1d3c 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -111,7 +111,8 @@ sub start
 	my $pagelth = $user->pagelth;
 	$pagelth = $default_pagelth unless defined $pagelth;
 	$self->{pagelth} = $pagelth;
-	($self->{width}) = $line =~ /width=(\d+)/; $line =~ s/\s*width=\d+\s*//;
+	($self->{width}) = $line =~ /\s*width=(\d+)/; $line =~ s/\s*width=\d+//;
+	$self->{enhanced} = $line =~ /\s+enhanced/; $line =~ s/\s*enhanced//;
 	if ($line =~ /host=/) {
 		my ($h) = $line =~ /host=(\d+\.\d+\.\d+\.\d+)/;
 		$line =~ s/\s*host=\d+\.\d+\.\d+\.\d+// if $h;
@@ -124,7 +125,7 @@ sub start
 	$self->{width} = 80 unless $self->{width} && $self->{width} > 80;
 	$self->{consort} = $line;	# save the connection type
 
-	LogDbg('DXCommand', "$call connected from $self->{hostname}");
+	LogDbg('DXCommand', "$call connected from $self->{hostname} cols $self->{width}" . ($self->{enhanced}?" enhanced":''));
 
 	# set some necessary flags on the user if they are connecting
 	$self->{beep} = $user->wantbeep;
@@ -156,7 +157,7 @@ sub start
 	# establish slug queue, if required
 	$self->{sluggedpcs} = [];
 	$self->{isslugged} = $DXProt::pc92_slug_changes + $DXProt::last_pc92_slug + 5 if $DXProt::pc92_slug_changes;
-	$self->{isslugged} = 0 if $self->{priv} > 0 || $user->registered || $user->homenode eq $main::mycall;
+	$self->{isslugged} = 0 if $self->{priv} || $user->registered || ($user->homenode && $user->homenode eq $main::mycall);
 
 	# send the relevant MOTD
 	$self->send_motd;
@@ -551,6 +552,7 @@ sub run_cmd
 			if ($package && $self->can("${package}::handle")) {
 				no strict 'refs';
 				dbg("cmd: package $package") if isdbg('command');
+#				Log('cmd', "$self->{call} on $self->{hostname} : '$cmd $args'");
 				my $t0 = [gettimeofday];
 				eval { @ans = &{"${package}::handle"}($self, $args) };
 				if ($@) {
@@ -647,7 +649,7 @@ sub disconnect
 #		@rout = $main::routeroot->del_user($uref);
 		@rout = DXProt::_del_thingy($main::routeroot, [$call, 0]);
 
-		dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
+		# 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);
@@ -1004,40 +1006,52 @@ sub format_dx_spot
 	my $self = shift;
 
 	my $t = ztime($_[2]);
-	my $loc = '';
-	my $clth = 30 + $self->{width} - 80;    # allow comment to grow according the screen width 
-	#	--$clth if $self->{consort} eq 'local';
-	
-	my $comment = substr (($_[3] || ''), 0, $clth);
-	$comment =~ s/\t/ /g;
+	my ($slot1, $slot2) = ('', '');
 	
+	my $clth = 30 + $self->{width} - 80;    # allow comment to grow according the screen width 
+	my $c = $_[3];
+	$c =~ s/\t/ /g;
+	my $comment = substr (($c || ''), 0, $clth);
 	$comment .= ' ' x ($clth - (length($comment)));
 	
-    if ($self->{user}->wantgrid) {
+    if (!$slot1 && $self->{user}->wantgrid) {
 		my $ref = DXUser::get_current($_[1]);
 		if ($ref && $ref->qra) {
-			my $cloc = ' ' . substr($ref->qra, 0, 4);
-			$comment = substr $comment, 0,  ($clth - (length($comment)+length($cloc)));
-			$comment .= $cloc;
+			$slot1 = ' ' . substr($ref->qra, 0, 4);
+		}
+	}
+	if (!$slot1 && $self->{user}->wantusstate) {
+		$slot1 = " $_[12]" if $_[12];
+	}
+	unless ($slot1) {
+		if ($self->{user}->wantdxitu) {
+			$slot1 = sprintf(" %2d", $_[8]) if defined $_[8]; 
+		} elsif ($self->{user}->wantdxcq) {
+			$slot1 = sprintf(" %2d", $_[9]) if defined $_[9];
 		}
+	}
+	$comment = substr($comment, 0,  $clth-length($slot1)) . $slot1 if $slot1;
+	
+    if (!$slot2 && $self->{user}->wantgrid) {
 		my $origin = $_[4];
 		$origin =~ s/-#$//;			# sigh......
-		$ref = DXUser::get_current($origin);
+		my $ref = DXUser::get_current($origin);
 		if ($ref && $ref->qra) {
-			$loc = ' ' . substr($ref->qra, 0, 4);
+			$slot2 = ' ' . substr($ref->qra, 0, 4);
+		}
+	}
+	if (!$slot2 && $self->{user}->wantusstate) {
+		$slot2 = " $_[13]" if $_[13];
+	}
+	unless ($slot2) {
+		if ($self->{user}->wantdxitu) {
+			$slot2 = sprintf(" %2d", $_[10]) if defined $_[10]; 
+		} elsif ($self->{user}->wantdxcq) {
+			$slot2 = sprintf(" %2d", $_[11]) if defined $_[11]; 
 		}
-	} elsif ($self->{user}->wantdxitu) {
-		$loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
-		$comment = substr($comment, 0,  $clth-3) . ' ' . sprintf("%2d", $_[8]) if defined $_[8]; 
-	} elsif ($self->{user}->wantdxcq) {
-		$loc = ' ' . sprintf("%2d", $_[11]) if defined $_[11];
-		$comment = substr($comment, 0, $clth-3) . ' ' . sprintf("%2d", $_[9]) if defined $_[9]; 
-	} elsif ($self->{user}->wantusstate) {
-		$loc = ' ' . $_[13] if $_[13];
-		$comment = substr($comment, 0,  $clth-3) . ' ' . $_[12] if $_[12]; 
 	}
 
-	return sprintf "DX de %-8.8s%10.1f  %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
+	return sprintf "DX de %-8.8s%10.1f  %-12.12s %-s $t$slot2", "$_[4]:", $_[0], $_[1], $comment;
 }
 
 
@@ -1397,19 +1411,5 @@ sub user_count
 	return ($users, $maxusers);
 }
 
-sub isregistered
-{
-	my $self = shift;
-
-	# the sysop is registered!
-	return 1 if $self->call eq $main::myalias || $self->call eq $main::mycall;
-	
-	if ($main::reqreg) {
-		return $self->{registered};
-	} else {
-		return 1;
-	}
-}
-
 1;
 __END__