use Sun;
use Internet;
use Script;
-
+use Net::Telnet;
+use QSL;
+use DB_File;
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase $maxerrors %nothereslug $maxbadcount);
use vars qw($VERSION $BRANCH);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
$main::build += $VERSION;
$main::branch += $BRANCH;
# ALWAYS output the user
my $ref = Route::User::get($call);
- DXProt::route_pc16($main::me, $main::routeroot, $ref) if $ref;
+ $main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
return $self;
}
$self->{here} = 1;
$self->{prompt} = $user->prompt if $user->prompt;
+ # sort out new dx spot stuff
+ $user->wantdxcq(0) unless defined $user->{wantdxcq};
+ $user->wantdxitu(0) unless defined $user->{wantdxitu};
+ $user->wantusstate(0) unless defined $user->{wantusstate};
+
# sort out registration
if ($main::reqreg == 1) {
$self->{registered} = $user->registered;
# do we need to send a forward/opernam?
my $lastoper = $user->lastoper || 0;
my $homenode = $user->homenode || "";
- if ($homenode eq $main::mycall && $lastoper + $DXUser::lastoperinterval < $main::systime) {
+ if ($homenode eq $main::mycall && $main::systime >= $lastoper + $DXUser::lastoperinterval) {
run_cmd($main::me, "forward/opernam $call");
- $user->lastoper($main::systime);
+ $user->lastoper($main::systime + ((int rand(10)) * 86400));
}
# run a script send the output to the punter
my $self = shift;
my $cmdline = shift;
my @ans;
+
+ # save this for them's that need it
+ my $rawline = $cmdline;
# remove leading and trailing spaces
$cmdline =~ s/^\s*(.*)\s*$/$1/;
}
$self->state('prompt');
delete $self->{talklist};
- } elsif ($cmdline =~ m(^/\w+)) {
- $cmdline =~ s(^/)();
- $self->send_ans(run_cmd($self, $cmdline));
+ } elsif ($cmdline =~ m|^/+\w+|) {
+ $cmdline =~ s|^/||;
+ my $sendit = $cmdline =~ s|^/+||;
+ my @in = $self->run_cmd($cmdline);
+ $self->send_ans(@in);
+ if ($sendit && $self->{talklist} && @{$self->{talklist}}) {
+ foreach my $l (@in) {
+ my @bad;
+ if (@bad = BadWords::check($l)) {
+ $self->badcount(($self->badcount||0) + @bad);
+ Log('DXCommand', "$self->{call} swore: $l");
+ } else {
+ for (@{$self->{talklist}}) {
+ $self->send_talks($_, $l);
+ }
+ }
+ }
+ }
$self->send($self->talk_prompt);
} elsif ($self->{talklist} && @{$self->{talklist}}) {
# send what has been said to whoever is in this person's talk list
Log('DXCommand', "$self->{call} swore: $cmdline");
} else {
for (@{$self->{talklist}}) {
- $self->send_talks($_, $cmdline);
+ $self->send_talks($_, $rawline);
}
}
$self->send($self->talk_prompt) if $self->{state} eq 'talk';
no strict 'refs';
my @ans;
if (ref $self->{edit}) {
- eval { @ans = $self->{edit}->$func($self, $cmdline)};
+ eval { @ans = $self->{edit}->$func($self, $rawline)};
} else {
- eval { @ans = &{$self->{func}}($self, $cmdline) };
+ eval { @ans = &{$self->{func}}($self, $rawline) };
}
if ($@) {
$self->send_ans("Syserr: on stored func $self->{func}", $@);
return ();
}
}
- return (@ans);
+ return map {s/([^\s])\s+$/$1/; $_} @ans;
}
#
dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
# issue a pc17 to everybody interested
- DXProt::route_pc17($main::me, $main::routeroot, $uref);
+ $main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
} else {
confess "trying to disconnect a non existant user $call";
}
no strict 'refs';
for (keys %Cache) {
- undef *{$_};
+ undef *{$_} unless /cmd_cache/;
dbg("Undefining cmd $_") if isdbg('command');
}
%cmd_cache = ();
$self->local_send($target eq 'WX' ? 'W' : 'N', $buf);
}
+# send a chat
+sub chat
+{
+ my $self = shift;
+ my $line = shift;
+ my $isolate = shift;
+ my $target = shift;
+ my $to = shift;
+ my $text = shift;
+ my ($filter, $hops);
+
+ return unless grep uc $_ eq $target, @{$self->{user}->{group}};
+
+ $text =~ s/^\#\d+ //;
+ my $buf = "$target de $_[0]: $text";
+ $buf =~ s/\%5E/^/g;
+ $buf .= "\a\a" if $self->{beep};
+ $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));
+ my $ref = DXUser->get_current($_[4]);
+ if ($ref) {
+ $loc = $ref->qra || '' if $self->{user}->wantgrid;
+ $loc = ' ' . substr($loc, 0, 4) if $loc;
+ }
+ $loc = "" unless $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
{
return unless $filter;
}
-
- my $t = ztime($_[2]);
- my $ref = DXUser->get_current($_[4]);
- my $loc = $ref->qra if $ref && $ref->qra && $self->{user}->wantgrid;
- $loc = ' ' . substr($loc, 0, 4) if $loc;
- $loc = "" unless $loc;
- my $buf = sprintf "DX de %-7.7s%11.1f %-12.12s %-*s $t$loc", "$_[4]:", $_[0], $_[1], $self->{consort} eq 'local' ? 29 : 30, $_[3];
+ dbg('spot: "' . join('","', @_) . '"') if isdbg('dxspot');
+
+ my $buf = $self->format_dx_spot(@_);
$buf .= "\a\a" if $self->{beep};
$buf =~ s/\%5E/^/g;
$self->local_send('X', $buf);
projects / spider.git / blobdiff