X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fregistered.pl;h=0b41164caea7f5cf1c5514773252c7c6cca400fe;hb=8ce3e54056026253e9e4a518b317dbbd8e71bb7a;hp=5eb6d78d7264ce670582e9a728e9660ab493b9a2;hpb=ab811a0c902225075a9bd69749f65594079433a9;p=spider.git diff --git a/cmd/show/registered.pl b/cmd/show/registered.pl index 5eb6d78d..0b41164c 100644 --- a/cmd/show/registered.pl +++ b/cmd/show/registered.pl @@ -20,21 +20,41 @@ if ($line) { $line = "^\U\Q$line"; } -my ($action, $count, $key, $data) = (0,0,0,0); -eval qq{for (\$action = DXUser::R_FIRST, \$count = 0; !\$DXUser::dbm->seq(\$key, \$data, \$action); \$action = DXUser::R_NEXT) { +@out = $self->spawn_cmd("show/registered $line", sub { + my @out; + my @val; + + + my ($action, $count, $key, $data) = (0,0,0,0); + eval qq{for (\$action = DXUser::R_FIRST, \$count = 0; !\$DXUser::dbm->seq(\$key, \$data, \$action); \$action = DXUser::R_NEXT) { if (\$data =~ m{registered}) { if (!\$line || (\$line && \$key =~ /^$line/)) { my \$u = DXUser::get_current(\$key); if (\$u && \$u->registered) { - push \@out, \$key; + push \@val, \$key; ++\$count; } } } } }; - -push @out, $@ if $@; - -return (1, @out, $self->msg('rec', $count)); + my @l; + foreach my $call (@val) { + if (@l >= 5) { + push @out, sprintf "%-12s %-12s %-12s %-12s %-12s", @l; + @l = (); + } + push @l, $call; + } + if (@l) { + push @l, "" while @l < 5; + push @out, sprintf "%-12s %-12s %-12s %-12s %-12s", @l; + } + + push @out, $@ if $@; + push @out, , $self->msg('rec', $count); + return @out; + }); + +return (1, @out);