X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fregistered.pl;h=d375532462f5e2158fcf4c8c0082199c083581d8;hb=HEAD;hp=ebc468d1cf2a44a2f9fc6e05187de03d7f4daae5;hpb=579810d363939640538f88a9caa86e01fe9c7709;p=spider.git

diff --git a/cmd/show/registered.pl b/cmd/show/registered.pl
index ebc468d1..d3755324 100644
--- a/cmd/show/registered.pl
+++ b/cmd/show/registered.pl
@@ -5,34 +5,59 @@
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
 return (1, $self->msg('e5')) unless $self->priv >= 9;
 
 my @out;
+my @val;
 
 use DB_File;
 
 if ($line) {
 	$line =~ s/[^\w\-\/]+//g;
-	$line = "^\U\Q$line";
+	$line = "\U\Q$line";
 }
 
+my %call = ();
+$call{$_} = 1 for split /\s+/, $line;
+delete $call{'ALL'};
+
 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{registered =>}) {					
-		if (!$line || ($line && $key =~ /$line/)) {
-			my $u = DXUser->get_current($key);
-			if ($u && $u->registered) {
-				push @out, $key;
-				++$count;
-			}
+unless (keys %call) {
+	for ($action = DXUser::R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) {
+		if ($data =~ m{registered}) {
+			$call{$key} = 1;       # possible candidate
 		}
 	}
-} 
+}
+
+foreach $key (sort keys %call) {
+	my $u = DXUser::get_current($key);
+	if ($u && defined (my $r = $u->registered)) {
+		push @val, "${key}($r)";
+		++$count;
+	}
+	
+}
+
+my @l;
+push @out, "Registration is " . ($main::reqreg ? "Required" :  "NOT Required");
+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;
+}
 
-return (1, @out, $self->msg('rec', $count));
+push @out, $self->msg('rec', $count);
+return (1, @out);