readd set/seeme and show/seeme commands

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 1960a8905f36a4561e1a23a41790328c2f3088fa..d17f6f9178e2accdba36803005ac43901484aa84 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -106,6 +106,7 @@ sub start
 
        $self->{name} = $name ? $name : $call;
        $self->send($self->msg('l2',$self->{name}));
+       $self->send("Capabilities: ve7cc rbn");
        $self->state('prompt');         # a bit of room for further expansion, passwords etc
        $self->{priv} = $user->priv || 0;
        $self->{lang} = $user->lang || $main::lang || 'en';
@@ -142,12 +143,14 @@ sub start
        $self->{here} = 1;
        $self->{prompt} = $user->prompt if $user->prompt;
        $self->{lastmsgpoll} = 0;
-
+       $self->{rbnseeme} = $user->rbnseeme;
+       RBN::add_seeme($call) if $self->{rbnseeme};
+       
        # 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 == 2) {
                $self->{registered} = !$user->registered;
@@ -164,7 +167,7 @@ sub start
        $self->send_motd;
 
        # sort out privilege reduction
-       $self->{priv} = 0 unless $self->{hostname} eq '127.0.0.1' || $self->{hostname} eq '::1' || $self->conn->{usedpasswd};
+       $self->{priv} = 0 unless $self->{hostname} eq '127.0.0.1' || $self->conn->peerhost eq '127.0.0.1' || $self->{hostname} eq '::1' || $self->conn->{usedpasswd};
 
        # get the filters
        my $nossid = $call;
@@ -648,6 +651,7 @@ sub disconnect
        return if $self->{disconnecting}++;
 
        delete $self->{senddbg};
+       RBN::del_seeme($call);
 
        my $uref = Route::User::get($call);
        my @rout;
@@ -1057,7 +1061,21 @@ sub format_dx_spot
                }
        }
 
-       return sprintf "DX de %-8.8s%10.1f  %-12.12s %-s $t$slot2", "$_[4]:", $_[0], $_[1], $comment;
+       my $o = sprintf("%-9s", $_[4] . ':');
+       my $qrg = sprintf "%8.1f", $_[0];
+       if (length $qrg >= 9) {
+               while (length($o)+length($qrg) > 17 && $o =~ / $/) {
+                       chop $o;
+               }
+       }
+       my $spot = sprintf "%-12s", $_[1];
+       my $front = "DX de $o $qrg  $spot";
+       while (length($front) > 38 && $front =~ /  $/) {
+               chop $front;
+       }
+
+       
+       return sprintf "$front %-s $t$slot2", $comment;
 }