X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fstation.pl;h=a5ffe2adc01f9e8f651da739982a10134dab5b46;hb=097f2329b24fd3082e880e789f8a38224784b0e0;hp=26f2bbe6489fbb7f3c0b0274ddf74a65a15d4ca7;hpb=9ffa482b325ca5b660a50e4bb845420cad17e969;p=spider.git

diff --git a/cmd/show/station.pl b/cmd/show/station.pl
index 26f2bbe6..a5ffe2ad 100644
--- a/cmd/show/station.pl
+++ b/cmd/show/station.pl
@@ -14,7 +14,8 @@ my $seek;
 push @f, $self->call unless @f;
 
 if (@f <= 2 && uc $f[0] eq 'ALL') {
-	return (1, $self->msg('e6')) if ($self->priv < 6); 
+	return (1, $self->msg('e6')) if @f == 1 && $self->priv < 6; 
+	return (1, $self->msg('e6')) if $self->priv < 5 || $f[1] eq '*'; 
 	shift @f;
 	my $exp = shellregex(uc shift @f) if @f; 
 	my @calls;
@@ -69,19 +70,19 @@ if (@f <= 2 && uc $f[0] eq 'ALL') {
 			}
 			
 			my $cref = Route::get($call);
-			my $seek = join(',', $cref->parents) if $cref;
+			my $seek = $cref->isa('Route::Node') ? $call : join(',', $cref->parents) if $cref;
 
 			if ($seek) {
-				push @out, "User         : $call (at $seek)";
+				push @out, sprintf("%-13s: %s (%s %s)", $self->msg('user'), $call, $self->msg('at'), $seek);
 			} else {
-				push @out, "User         : $call";
+				push @out, sprintf("%-13s: %s", $self->msg('user'), $call);
 			}
-			push @out, "Name         : $name" if $name;
-			push @out, "Last Connect : $last" if $last;
-			push @out, "QTH          : $qth" if $qth;
-			push @out, "Location     : $latlong ($qra)" if $latlong || $qra ;
-			push @out, sprintf("Heading      : %.0f Deg %.0f Mi. %.0f Km.", $bearing, $miles, $dx) if $latlong;
-			push @out, "Home Node    : $homenode" if $homenode;
+			push @out, sprintf("%-13s: %s", $self->msg('name1'), $name) if $name;
+			push @out, sprintf("%-13s: %s", $self->msg('lastconn'), $last) if $last;
+			push @out, sprintf("%-13s: %s", 'QTH', $qth) if $qth;
+			push @out, sprintf("%-13s: %s", $self->msg('location'), "$latlong ($qra)") if $latlong || $qra ;
+			push @out, sprintf("%-13s: %.0f Deg. %.0f Mi. %.0f Km.", $self->msg('heading'), $bearing, $miles, $dx) if $latlong;
+			push @out, sprintf("%-13s: %s", $self->msg('homenode2'), $homenode) if $homenode;
 		} else {
 			push @out, $self->msg('usernf', $call);
 		}