Change DXUser->get* to DXUser::get*

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

diff --git a/cmd/show/lockout.pl b/cmd/show/lockout.pl
index f4c87a87c668a767fdb6719e879d643b6fce4201..91ae4f4ae7ab87fc84943a03673db98386a342b2 100644 (file)
--- a/cmd/show/lockout.pl
+++ b/cmd/show/lockout.pl
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 2000 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -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));