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;
my $pkg = shift;
my $call = shift;
my @rout = $main::routeroot->add_user($call, Route::here(1));
- DXProt::route_pc16($main::me, $main::routeroot, @rout) if @rout;
+
+ # ALWAYS output the user
+ my $ref = Route::User::get($call);
+ DXProt::route_pc16($main::me, $main::routeroot, $ref) if $ref;
return $self;
}
$self->{priv} = $user->priv || 0;
$self->{lang} = $user->lang || $main::lang || 'en';
$self->{pagelth} = $user->pagelth || 20;
- ($self->{width}) = $line =~ /width=(\d+)/;
+ ($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
$self->{logininfo} = $user->wantlogininfo;
$self->{ann_talk} = $user->wantann_talk;
$self->{here} = 1;
+ $self->{prompt} = $user->prompt if $user->prompt;
# sort out registration
if ($main::reqreg == 1) {
# 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}", $@);
+ delete $self->{func};
$self->state('prompt');
undef $@;
}
return ();
}
}
- return (@ans);
+ return map {s/[^\s]\s+$//; $_} @ans;
}
#
if ($uref) {
@rout = $main::routeroot->del_user($uref);
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);
} else {
confess "trying to disconnect a non existant user $call";
}
- # issue a pc17 to everybody interested
- DXProt::route_pc17($main::me, $main::routeroot, @rout) if @rout;
-
# I was the last node visited
$self->user->node($main::mycall);
sub prompt
{
my $self = shift;
- $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call, cldate($main::systime), ztime($main::systime)));
+ if ($self->{prompt}) {
+ $self->send($self->{prompt});
+ } else {
+ $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call, cldate($main::systime), ztime($main::systime)));
+ }
}
# broadcast a message to all users [except those mentioned after buffer]
no strict 'refs';
for (keys %Cache) {
- undef *{$_};
+ undef *{$_} unless /cmd_cache/;
dbg("Undefining cmd $_") if isdbg('command');
}
%cmd_cache = ();
return unless $filter;
}
- my $buf = Spot::formatb($self->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
+
+ 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];
$buf .= "\a\a" if $self->{beep};
$buf =~ s/\%5E/^/g;
$self->local_send('X', $buf);