make sure it's a row of 5 and not 4

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

diff --git a/cmd/show/configuration.pl b/cmd/show/configuration.pl
index 51c39dd07a8fa22733a429c69355cc26e498c561..7c4bbf27572cc5d9931f54605b6a2531e84d746d 100644 (file)
--- a/cmd/show/configuration.pl
+++ b/cmd/show/configuration.pl
@@ -14,7 +14,7 @@ my $node;
 my @l;
 my @val;
 
-push @out, "Node         Callsigns";
+push @out, $self->msg('showconf');
 if ($list[0] && $list[0] =~ /^NOD/) {
        my @ch = sort {$a->call cmp $b->call} DXChannel::get_all_nodes();
        my $dxchan;
@@ -27,21 +27,18 @@ if ($list[0] && $list[0] =~ /^NOD/) {
                $call = "($call)" unless $dxchan->here;
                push @l, $call;
                
-               my $i = 0;
                foreach my $ref (@val) {
-                       if ($i >= 5) {
+                       if (@l >= 5) {
                                push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
                                @l = ();
                                push @l, "";
-                               $i = 0;
                        }
                        my $s = $ref->call;
                        $s ||= '???';
                        $s = sprintf "(%s)", $s unless $ref->here;
                        push @l, $s;
-                       $i++;
                }
-               push @l, "" while ($i++ < 5);
+               push @l, "" while @l < 5;
                push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
        }
 } else {
@@ -55,7 +52,7 @@ if ($list[0] && $list[0] =~ /^NOD/) {
                        if (@list) {
                                next unless grep $node->call =~ /^$_/, @list;
                        } else {
-                               next unless $node->dxcc == $self->dxcc;
+                               next unless grep $node->dxcc == $_, @main::my_cc;
                        }
                }
                my $call = $node->call;
@@ -65,16 +62,14 @@ if ($list[0] && $list[0] =~ /^NOD/) {
                push @l, $call;
                @val = sort $node->users;
 
-               my $i = 0;
                if (@val == 0 && $node->usercount) {
                        push @l, sprintf "(%d users)", $node->usercount;
                }
                foreach $call (@val) {
-                       if ($i >= 5) {
+                       if (@l >= 6) {
                                push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
                                @l = ();
                                push @l, "";
-                               $i = 0;
                        }
                        my $uref = Route::User::get($call);
                        my $s = $call;
@@ -84,9 +79,8 @@ if ($list[0] && $list[0] =~ /^NOD/) {
                                $s = "$call?";
                        }
                        push @l, $s;
-                       $i++;
                }
-               push @l, "" while ($i++ < 5);
+               push @l, "" while @l < 6;
                push @out, sprintf "%-12s %-12s %-12s %-12s %-12s %-12s", @l;
        }
 }