X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=debc23d2af1dddc01fc1b5f4ed1aafd4c05896fe;hb=72dc0f2eeecaf78902acacb9d183b7f9215dd385;hp=7b69ad22c1b17d4e462f588b196418e5121c04d0;hpb=fe4f4e3751da3786d25df2fe2fba104523de095d;p=spider.git diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm index 7b69ad22..debc23d2 100644 --- a/perl/DXCommandmode.pm +++ b/perl/DXCommandmode.pm @@ -129,7 +129,12 @@ sub start # decide which motd to send - my $motd = "${main::motd}_nor" unless $self->{registered}; + my $motd; + unless ($self->{registered}) { + $motd = "${main::motd}_nor_$self->{lang}"; + $motd = "${main::motd}_nor" unless -e $motd; + } + $motd = "${main::motd}_$self->{lang}" unless $motd && -e $motd; $motd = $main::motd unless $motd && -e $motd; $self->send_file($motd) if -e $motd; @@ -958,7 +963,7 @@ sub do_entry_stuff my $loc = $self->{loc} || confess "local var gone missing" ; if ($line eq "\032" || $line eq '%1A' || uc $line eq "/EX") { no strict 'refs'; - push @out, $loc->{endaction}($self); + push @out, &{$loc->{endaction}}($self); # like this for < 5.8.0 $self->func(undef); $self->state('prompt'); } elsif ($line eq "\031" || uc $line eq "/ABORT" || uc $line eq "/QUIT") {