use QSL;
use DB_File;
use VE7CC;
+use Thingy;
+use Thingy::Dx;
+use Thingy::Hello;
+use Thingy::Bye;
use strict;
-use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount $msgpolltime);
+use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug
+ $maxbadcount $msgpolltime $default_pagelth);
%Cache = (); # cache of dynamically loaded routine's mod times
%cmd_cache = (); # cache of short names
$maxerrors = 20; # the maximum number of concurrent errors allowed before disconnection
$maxbadcount = 3; # no of bad words allowed before disconnection
$msgpolltime = 3600; # the time between polls for new messages
+$default_pagelth = 20; # the default page length 0 = unlimited
+
use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
#
# obtain a new connection this is derived from dxchannel
# routing, this must go out here to prevent race condx
my $pkg = shift;
my $call = shift;
- my @rout = $main::routeroot->add_user($call, Route::here(1));
+ my @rout = $main::routeroot->add_user($call, 1);
- # ALWAYS output the user
+
my $ref = Route::User::get($call);
$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
-
return $self;
}
$self->state('prompt'); # a bit of room for further expansion, passwords etc
$self->{priv} = $user->priv || 0;
$self->{lang} = $user->lang || $main::lang || 'en';
- $self->{pagelth} = $user->pagelth || 20;
+ my $pagelth = $user->pagelth;
+ $pagelth = $default_pagelth unless defined $pagelth;
+ $self->{pagelth} = $pagelth;
($self->{width}) = $line =~ /width=(\d+)/; $line =~ s/\s*width=\d+\s*//;
$self->{width} = 80 unless $self->{width} && $self->{width} > 80;
$self->{consort} = $line; # save the connection type
# decide which motd to send
- my $motd = "${main::motd}_nor" unless $self->{registered};
+ my $motd;
+ unless ($self->{registered}) {
+ $motd = "${main::motd}_nor_$self->{lang}";
+ $motd = "${main::motd}_nor" unless -e $motd;
+ }
+ $motd = "${main::motd}_$self->{lang}" unless $motd && -e $motd;
$motd = $main::motd unless $motd && -e $motd;
$self->send_file($motd) if -e $motd;
$user->lastoper($main::systime + ((int rand(10)) * 86400));
}
+ # ALWAYS output the user
+ my $thing = Thingy::Hello->new(user => $call, h => $self->{here});
+ $thing->broadcast($self);
+ $self->lasthello($main::systime);
+
# run a script send the output to the punter
my $script = new Script(lc $call) || new Script('user_default');
$script->run($self) if $script;
$args = "" unless defined $args;
if ($cmd) {
- # strip out // on command only
+ # strip out // and .. on command only
$cmd =~ s|//|/|g;
+ $cmd =~ s|^/||g; # no leading / either
+ $cmd =~ s|[^-?\w/]||g; # and no funny characters
my ($path, $fcmd);
# first expand out the entry to a command
($path, $fcmd) = search($main::localcmd, $cmd, "pl");
- ($path, $fcmd) = search($main::cmd, $cmd, "pl") if !$path || !$fcmd;
+ ($path, $fcmd) = search($main::cmd, $cmd, "pl") unless $path && $fcmd;
if ($path && $cmd) {
dbg("path: $cmd cmd: $fcmd") if isdbg('command');
sub process
{
my $t = time;
- my @dxchan = DXChannel->get_all();
+ my @dxchan = DXChannel::get_all();
my $dxchan;
foreach $dxchan (@dxchan) {
# issue a pc17 to everybody interested
$main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
+
+ my $thing = Thingy::Bye->new(user=>$call);
+ $thing->broadcast($self);
} else {
confess "trying to disconnect a non existant user $call";
}
# send info to all logged in thingies
$self->tell_login('logoutu');
+ # remove any outstanding pings I have sent
+ Thingy::Ping::forget($call);
+
Log('DXCommand', "$call disconnected");
$self->SUPER::disconnect;
my $pkg = shift; # ignored
my $s = shift; # the line to be rebroadcast
- foreach my $dxchan (DXChannel->get_all()) {
+ foreach my $dxchan (DXChannel::get_all()) {
next unless $dxchan->{sort} eq 'U'; # only interested in user channels
next if grep $dxchan == $_, @_;
$dxchan->send($s); # send it
# gimme all the users
sub get_all
{
- return grep {$_->{sort} eq 'U'} DXChannel->get_all();
+ return grep {$_->{sort} eq 'U'} DXChannel::get_all();
}
# run a script for this user
my @parts = split '/', $short_cmd;
my $dirfn;
my $curdir = $path;
- my $p;
- my $i;
- my @lparts;
- for ($i = 0; $i < @parts; $i++) {
- my $p = $parts[$i];
+ while (my $p = shift @parts) {
opendir(D, $curdir) or confess "can't open $curdir $!";
my @ls = readdir D;
closedir D;
- my $l;
- foreach $l (sort @ls) {
- next if $l =~ /^\./;
- if ($i < $#parts) { # we are dealing with directories
+
+ # if this isn't the last part
+ if (@parts) {
+ my $found;
+ foreach my $l (sort @ls) {
+ next if $l =~ /^\./;
if ((-d "$curdir/$l") && $p eq substr($l, 0, length $p)) {
dbg("got dir: $curdir/$l\n") if isdbg('command');
$dirfn .= "$l/";
$curdir .= "/$l";
+ $found++;
last;
}
- } else { # we are dealing with commands
- @lparts = split /\./, $l;
- next if $lparts[$#lparts] ne $suffix; # only look for .$suffix files
+ }
+ # only proceed if we find the directory asked for
+ return () unless $found;
+ } else {
+ foreach my $l (sort @ls) {
+ next if $l =~ /^\./;
+ next unless $l =~ /\.$suffix$/;
if ($p eq substr($l, 0, length $p)) {
- pop @lparts; # remove the suffix
- $l = join '.', @lparts;
- # chop $dirfn; # remove trailing /
+ $l =~ s/\.$suffix$//;
$dirfn = "" unless $dirfn;
$cmd_cache{$short_cmd} = join(',', ($path, "$dirfn$l")); # cache it
dbg("got path: $path cmd: $dirfn$l\n") if isdbg('command');
$self->local_send('C', $buf);
}
-sub format_dx_spot
-{
- my $self = shift;
-
- my $t = ztime($_[2]);
- my $loc = '';
- my $clth = $self->{consort} eq 'local' ? 29 : 30;
- my $comment = substr $_[3], 0, $clth;
- $comment .= ' ' x ($clth - length($comment));
- if ($self->{user}->wantgrid) {
- my $ref = DXUser->get_current($_[4]);
- if ($ref) {
- $loc = $ref->qra || '';
- $loc = ' ' . substr($loc, 0, 4) if $loc;
- }
- }
-
- if ($self->{user}->wantdxitu) {
- $loc = ' ' . sprintf("%2d", $_[10]) if defined $_[10];
- $comment = substr($comment, 0, $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[8]) if defined $_[8];
- } elsif ($self->{user}->wantdxcq) {
- $loc = ' ' . sprintf("%2d", $_[11]) if defined $_[11];
- $comment = substr($comment, 0, $self->{consort} eq 'local' ? 26 : 27) . ' ' . sprintf("%2d", $_[9]) if defined $_[9];
- } elsif ($self->{user}->wantusstate) {
- $loc = ' ' . $_[13] if $_[13];
- $comment = substr($comment, 0, $self->{consort} eq 'local' ? 26 : 27) . ' ' . $_[12] if $_[12];
- }
-
- return sprintf "DX de %-7.7s%11.1f %-12.12s %-s $t$loc", "$_[4]:", $_[0], $_[1], $comment;
-}
-
-# send a dx spot
-sub dx_spot
-{
- my $self = shift;
- my $line = shift;
- my $isolate = shift;
- return unless $self->{dx};
-
- my ($filter, $hops);
-
- if ($self->{spotsfilter}) {
- ($filter, $hops) = $self->{spotsfilter}->it(@_ );
- return unless $filter;
- }
-
- dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
-
- my $buf;
- if ($self->{ve7cc}) {
- $buf = VE7CC::dx_spot($self, @_);
- } else {
- $buf = $self->format_dx_spot(@_);
- $buf .= "\a\a" if $self->{beep};
- $buf =~ s/\%5E/^/g;
- }
-
- $self->local_send('X', $buf);
-}
sub wwv
{
{
my $s = shift; # the line to be rebroadcast
- foreach my $dxchan (DXChannel->get_all) {
+ foreach my $dxchan (DXChannel::get_all) {
next unless $dxchan->{enhanced} && $dxchan->{senddbg};
$dxchan->send_later('L', $s);
}
projects / spider.git / blobdiff