X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fshow%2Fregistered.pl;h=6b930be224d3d3f7ce6cf45ef65345ca08e7d818;hb=8e14149148baba63ce5ae2b95aacda8ab6dd0d87;hp=7e3ce45def2a5f6d8e14def1ec46dbf7f9333b17;hpb=a76624e4742348ed0f39c7c3f732cdec8462da9e;p=spider.git

diff --git a/cmd/show/registered.pl b/cmd/show/registered.pl
index 7e3ce45d..6b930be2 100644
--- a/cmd/show/registered.pl
+++ b/cmd/show/registered.pl
@@ -8,53 +8,75 @@
 #
 #
 
-my ($self, $line) = @_;
-return (1, $self->msg('e5')) unless $self->priv >= 9;
+sub handle
+{
+	my ($self, $line) = @_;
+	return (1, $self->msg('e5')) unless $self->priv >= 9;
 
-my @out;
+	my @out;
 
-use DB_File;
+	use DB_File;
 
-if ($line) {
-	$line =~ s/[^\w\-\/]+//g;
-	$line = "^\U\Q$line";
+	if ($line) {
+		$line =~ s/[^\w\-\/]+//g;
+		$line = "\U\Q$line";
+	}
+
+	if ($self->{_nospawn} || $main::is_win == 1) {
+		@out = generate($self, $line);
+	} else {
+		@out = $self->spawn_cmd("show/registered $line", sub { return (generate($self, $line)); });
+	}
+
+	return (1, @out);
 }
 
-@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{registered}) {					
-		if (!\$line || (\$line && \$key =~ /^$line/)) {
-			my \$u = DXUser::get_current(\$key);
-			if (\$u && \$u->registered) {
-				push \@val, \$key;
-				++\$count;
+sub generate
+{
+	my $self = shift;
+	my $line = shift;
+	my @out;
+	my @val;
+
+#	dbg("set/register line: $line");
+
+	my %call = ();
+	$call{$_} = 1 for split /\s+/, $line;
+	delete $call{'ALL'};
+
+	my ($action, $count, $key, $data) = (0,0,0,0);
+	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
 			}
 		}
 	}
-} };
-							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);
 
+	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 "%-14s %-14s %-14s %-14s %-14s", @l;
+			@l = ();
+		}
+		push @l, $call;
+	}
+	if (@l) {
+		push @l, "" while @l < 5;
+		push @out, sprintf "%-14s %-14s %-14s %-14s %-14s", @l;
+	}
+
+	push @out, $self->msg('rec', $count);
+	return @out;
+	
+}