X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Flockout.pl;h=e97b4bcf34c53436429478592a624ac2bd8fe5f4;hb=e2ca7811e49048bfad82ec31e148a79fe9904e2b;hp=91ae4f4ae7ab87fc84943a03673db98386a342b2;hpb=ab811a0c902225075a9bd69749f65594079433a9;p=spider.git

diff --git a/cmd/show/lockout.pl b/cmd/show/lockout.pl
index 91ae4f4a..e97b4bcf 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("show lockout $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{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);