X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Flockout.pl;fp=cmd%2Fshow%2Flockout.pl;h=d2133df5ce3d41651f4fca503a64caf974c99938;hb=a76624e4742348ed0f39c7c3f732cdec8462da9e;hp=91ae4f4ae7ab87fc84943a03673db98386a342b2;hpb=761aaa75e6522761e09c819aa446ee1777bdb3db;p=spider.git diff --git a/cmd/show/lockout.pl b/cmd/show/lockout.pl index 91ae4f4a..d2133df5 100644 --- a/cmd/show/lockout.pl +++ b/cmd/show/lockout.pl @@ -22,21 +22,41 @@ if ($line) { return (1, $self->msg('lockoutuse')) unless $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(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{lockout}) { if (\$line eq 'ALL' || \$key =~ /^$line/) { my \$ur = DXUser::get_current(\$key); if (\$ur && \$ur->lockout) { - 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);