sort our priv levels in a more sophisticated way

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

diff --git a/cmd/show/station.pl b/cmd/show/station.pl
index 40c7eddbe3d6f59c7805ad9cba07b9a5f7f266eb..d9f2b9d10d631f8feb433b5aec0f67159546b567 100644 (file)
--- a/cmd/show/station.pl
+++ b/cmd/show/station.pl
@@ -11,10 +11,20 @@ my @f = split /\s+/, uc $line;
 my @out;
 my $call;
 my $seek;
+push @f, $self->call unless @f;
 
-if (@f == 0) {
-       return (1, $self->msg('e6')) if ($self->priv < 5); 
-       my @calls = DXUser::get_all_calls();
+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 '*'; 
+       shift @f;
+       my $exp = shellregex(uc shift @f) if @f; 
+       my @calls;
+       if ($exp) {
+               @calls = grep {m{$exp}} DXUser::get_all_calls();
+    } else {
+               @calls = DXUser::get_all_calls();
+       }
+       
        foreach $call (@calls) {
                my $ref = DXUser->get_current($call);
                next if !$ref;
@@ -59,8 +69,8 @@ if (@f == 0) {
                                $miles = $dx * 0.62133785;
                        }
                        
-                       my $cref = DXCluster->get($call);
-                       my $seek = $cref->mynode->call if $cref;
+                       my $cref = Route::get($call);
+                       my $seek = join(',', $cref->parents) if $cref;
 
                        if ($seek) {
                                push @out, "User         : $call (at $seek)";