From: Dirk Koopman <djk@tobit.co.uk>
Date: Mon, 6 Dec 2021 21:18:27 +0000 (+0000)
Subject: fix sh/registered
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=f5938b5fe66c95b9973bcca267afb3f87cfb20f4;p=spider.git

fix sh/registered
---

diff --git a/Changes b/Changes
index af509b48..ef0d371c 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+06Dec21=======================================================================
+1. Fix show/register to allow query of individual calls as well as get a 
+   complete list.
 15Jul21=======================================================================
 1. Fix long standing bug in crontabs that commands with " rather than ' around
    strings could cause those commands not to work. 
diff --git a/cmd/set/register.pl b/cmd/set/register.pl
index ac96c2a4..edcf1acd 100644
--- a/cmd/set/register.pl
+++ b/cmd/set/register.pl
@@ -17,7 +17,7 @@ if ($self->priv < 9) {
 	Log('DXCommand', $self->call . " attempted to register @args");
 	return (1, $self->msg('e5'));
 }
-return (1, $self->msg('reginac')) unless $main::reqreg;
+#return (1, $self->msg('reginac')) unless $main::reqreg;
 
 foreach $call (@args) {
 	$call = uc $call;
diff --git a/cmd/show/registered.pl b/cmd/show/registered.pl
index 5eb6d78d..929d014d 100644
--- a/cmd/show/registered.pl
+++ b/cmd/show/registered.pl
@@ -12,29 +12,50 @@ 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);
-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 \@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 && $u->registered) {
+		push @val, $key;
+		++$count;
+	}
+}
 
-push @out, $@ if $@;
+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;
+}
 
-return (1, @out, $self->msg('rec', $count));
+push @out, $self->msg('rec', $count);
+return (1, @out);
 
 
diff --git a/connect/gb7tlh b/connect/gb7tlh
index 15b419a3..48c45f50 100644
--- a/connect/gb7tlh
+++ b/connect/gb7tlh
@@ -1,8 +1,3 @@
 timeout 15
-abort (Busy|Sorry|Fail)
-# don't forget to chmod 4775 netrom_call!
-connect ax25 /usr/sbin/netrom_call bbs gb7djk g1tlh-0
-'Connect' ''
-'Connect' 'ak1a'
-'Connect'  ''
-client gb7tlh ax25
+connect telnet dirk7.int.tobit.co.uk 7300
+'ogin:' 'gb7tlh-1'