hamradio/spider
1
0
Fork 0
mirror of git://scm.dxcluster.org/scm/spider synced 2024-09-21 07:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix sh/registered

Browse Source
This commit is contained in:
Dirk Koopman 2021-12-06 21:18:27 +00:00
parent 8e385017b2
commit f5938b5fe6
4 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changes
View File

@ -1,3 +1,6 @@
06Dec21=======================================================================
1. Fix show/register to allow query of individual calls as well as get a
complete list.
15Jul21======================================================================= 15Jul21=======================================================================
1. Fix long standing bug in crontabs that commands with " rather than ' around 1. Fix long standing bug in crontabs that commands with " rather than ' around
strings could cause those commands not to work. strings could cause those commands not to work.

2
cmd/set/register.pl
View File

@ -17,7 +17,7 @@ if ($self->priv < 9) {
Log('DXCommand', $self->call . " attempted to register @args"); Log('DXCommand', $self->call . " attempted to register @args");
return (1, $self->msg('e5')); return (1, $self->msg('e5'));
} }
return (1, $self->msg('reginac')) unless $main::reqreg; #return (1, $self->msg('reginac')) unless $main::reqreg;
foreach $call (@args) { foreach $call (@args) {
$call = uc $call; $call = uc $call;

43
cmd/show/registered.pl
View File

@ -12,29 +12,50 @@ my ($self, $line) = @_;
return (1, $self->msg('e5')) unless $self->priv >= 9; return (1, $self->msg('e5')) unless $self->priv >= 9;
my @out; my @out;
my @val;
use DB_File; use DB_File;
if ($line) { if ($line) {
$line =~ s/[^\w\-\/]+//g; $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); 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) { unless (keys %call) {
if (\$data =~ m{registered}) { for ($action = DXUser::R_FIRST, $count = 0; !$DXUser::dbm->seq($key, $data, $action); $action = DXUser::R_NEXT) {
if (!\$line || (\$line && \$key =~ /^$line/)) { if ($data =~ m{registered}) {
my \$u = DXUser::get_current(\$key); $call{$key} = 1; # possible candidate
if (\$u && \$u->registered) {
push \@out, \$key;
++\$count;
} }
} }
} }
} };
push @out, $@ if $@; foreach $key (sort keys %call) {
my $u = DXUser::get_current($key);
if ($u && $u->registered) {
push @val, $key;
++$count;
}
}
return (1, @out, $self->msg('rec', $count)); 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, $self->msg('rec', $count);
return (1, @out);

9
connect/gb7tlh
View File

@ -1,8 +1,3 @@
timeout 15 timeout 15
abort (Busy|Sorry|Fail) connect telnet dirk7.int.tobit.co.uk 7300
# don't forget to chmod 4775 netrom_call! 'ogin:' 'gb7tlh-1'
connect ax25 /usr/sbin/netrom_call bbs gb7djk g1tlh-0
'Connect' ''
'Connect' 'ak1a'
'Connect' ''
client gb7tlh ax25