X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=8b704ab5333f4f011617bd0ca88ea795dbf8743a;hb=cc8043c4d905986b3dc949bbde21ed4aeb254f8c;hp=791256dc7090a45b864e1c1ca230565d43d207ee;hpb=06963a9fca5e08982934c10946b8452f13feba2c;p=spider.git diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index 791256dc..8b704ab5 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -63,7 +63,10 @@ sub new 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; } @@ -104,6 +107,7 @@ sub start $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) { @@ -495,13 +499,13 @@ sub disconnect 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); @@ -520,7 +524,11 @@ sub disconnect 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]