X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Flockout.pl;h=02acee096122565c74a63d4323aabdc9d049a4da;hb=4888cab7f56fbed40bf28477fe3f9c0ee9977a7c;hp=f4c87a87c668a767fdb6719e879d643b6fce4201;hpb=50f6466ca2dff82ca470a4abe327d741cffef61a;p=spider.git

diff --git a/cmd/show/lockout.pl b/cmd/show/lockout.pl
index f4c87a87..02acee09 100644
--- a/cmd/show/lockout.pl
+++ b/cmd/show/lockout.pl
@@ -16,22 +16,26 @@ my @out;
 use DB_File;
 
 if ($line) {
-	$line =~ s/[^\w-\/]+//g;
-	$line = "^\U\Q$line";
+	$line =~ s/[^\w\-\/]+//g;
+	$line = "\U\Q$line";
 }
 
+return (1, $self->msg('lockoutuse')) unless $line;
+
 my ($action, $count, $key, $data) = (0,0,0,0);
-for ($action = DXUser::R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) {
-	if ($data =~ m{lockout =>}) {
-		if ($line && $key =~ /$line/) {
-			my $u = DXUser->get_current($key);
-			if ($u && $u->lockout) {
-				push @out, $key;
-				++$count;
+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;
+				++\$count;
 			}
 		}
 	}
-} 
+} };
+
+push @out, $@ if $@;
 
 return (1, @out, $self->msg('rec', $count));