make DXUser use JSON::XS and Sqlite

[spider.git] / cmd / show / station.pl

diff --git a/cmd/show/station.pl b/cmd/show/station.pl
index 868ebda9b81f34cd5aed73f20b39044cb1a19aaf..f6e43f1a2b64ea0cb73bfaac1a2012ee67cf4d52 100644 (file)
--- a/cmd/show/station.pl
+++ b/cmd/show/station.pl
@@ -14,8 +14,8 @@ my $seek;
 push @f, $self->call unless @f;
 
 if (@f <= 2 && uc $f[0] eq 'ALL') {
-       return (1, $self->msg('e6')) if @f == 1 && $self->priv < 6; 
-       return (1, $self->msg('e6')) if $self->priv < 5 || $f[1] eq '*'; 
+       return (1, $self->msg('e6')) if $self->remotecmd && $self->priv < 6; 
+       return (1, $self->msg('e6')) if $self->priv < 5; 
        shift @f;
        my $exp = shellregex(uc shift @f) if @f; 
        my @calls;
@@ -26,7 +26,7 @@ if (@f <= 2 && uc $f[0] eq 'ALL') {
        }
        
        foreach $call (@calls) {
-               my $ref = DXUser->get_current($call);
+               my $ref = DXUser::get_current($call);
                next if !$ref;
                my $lat = $ref->lat;
                my $long = $ref->long;
@@ -42,7 +42,7 @@ if (@f <= 2 && uc $f[0] eq 'ALL') {
        }
 } else {
        foreach $call (@f) {
-               my $ref = DXUser->get_current($call);
+               my $ref = DXUser::get_current($call);
                if ($ref) {
                        my $name = $ref->name;  
                        my $qth = $ref->qth;
@@ -73,16 +73,16 @@ if (@f <= 2 && uc $f[0] eq 'ALL') {
                        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);
                }