1. fix set/lockout so that it is possible to lock out all SSIDs except those

[spider.git] / perl / DXCommandmode.pm

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 4142f043f3aa024c98e07f4f5aff57e993c2ddd0..a8418bd4daf0af368947b188f8c30a534279f26d 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -61,7 +61,7 @@ sub new
        my $pkg = shift;
        my $call = shift;
        my @rout = $main::routeroot->add_user($call, Route::here(1));
-       DXProt::route_pc16($DXProt::me, $main::routeroot, @rout) if @rout;
+       DXProt::route_pc16($main::me, $main::routeroot, @rout) if @rout;
 
        return $self;
 }
@@ -120,15 +120,6 @@ sub start
                $user->qra(DXBearing::lltoqra($lat, $long)) if (defined $lat && defined $long);  
        }
 
-       # send prompts and things
-       my $info = Route::cluster();
-       $self->send("Cluster:$info");
-       $self->send($self->msg('namee1')) if !$user->name;
-       $self->send($self->msg('qthe1')) if !$user->qth;
-       $self->send($self->msg('qll')) if !$user->qra || (!$user->lat && !$user->long);
-       $self->send($self->msg('hnodee1')) if !$user->qth;
-       $self->send($self->msg('m9')) if DXMsg::for_me($call);
-
        # decide on echo
        if (!$user->wantecho) {
                $self->send_now('E', "0");
@@ -141,7 +132,7 @@ sub start
        my $lastoper = $user->lastoper || 0;
        my $homenode = $user->homenode || ""; 
        if ($homenode eq $main::mycall && $lastoper + $DXUser::lastoperinterval < $main::systime) {
-               run_cmd($DXProt::me, "forward/opernam $call");
+               run_cmd($main::me, "forward/opernam $call");
                $user->lastoper($main::systime);
        }
 
@@ -149,6 +140,16 @@ sub start
        my $script = new Script(lc $call) || new Script('user_default');
        $script->run($self) if $script;
 
+       # send cluster info
+       my $info = Route::cluster();
+       $self->send("Cluster:$info");
+
+       # send prompts and things
+       $self->send($self->msg('namee1')) if !$user->name;
+       $self->send($self->msg('qthe1')) if !$user->qth;
+       $self->send($self->msg('qll')) if !$user->qra || (!$user->lat && !$user->long);
+       $self->send($self->msg('hnodee1')) if !$user->qth;
+       $self->send($self->msg('m9')) if DXMsg::for_me($call);
        $self->prompt;
 }
 
@@ -450,7 +451,7 @@ sub disconnect
        }
 
        # issue a pc17 to everybody interested
-       DXProt::route_pc17($DXProt::me, $main::routeroot, @rout) if @rout;
+       DXProt::route_pc17($main::me, $main::routeroot, @rout) if @rout;
 
        # I was the last node visited
     $self->user->node($main::mycall);