projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uppercase it
[spider.git]
/
perl
/
DXCommandmode.pm
diff --git
a/perl/DXCommandmode.pm
b/perl/DXCommandmode.pm
index 72d65cb316ebd05d0d36d76fd7330bcfd7a28d50..3c45aee968f0c1c0ebc8c1c560f8f0e184d51d5a 100644
(file)
--- a/
perl/DXCommandmode.pm
+++ b/
perl/DXCommandmode.pm
@@
-29,6
+29,7
@@
use DXDb;
use AnnTalk;
use WCY;
use Sun;
use AnnTalk;
use WCY;
use Sun;
+use Internet;
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase);
use strict;
use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase);
@@
-65,7
+66,7
@@
sub start
$self->send_file($main::motd) if (-e $main::motd);
$self->state('prompt'); # a bit of room for further expansion, passwords etc
$self->{priv} = $user->priv || 0;
$self->send_file($main::motd) if (-e $main::motd);
$self->state('prompt'); # a bit of room for further expansion, passwords etc
$self->{priv} = $user->priv || 0;
- $self->{lang} = $user->lang || 'en';
+ $self->{lang} = $user->lang ||
$main::lang ||
'en';
$self->{pagelth} = $user->pagelth || 20;
$self->{priv} = 0 if $line =~ /^(ax|te)/; # set the connection priv to 0 - can be upgraded later
$self->{consort} = $line; # save the connection type
$self->{pagelth} = $user->pagelth || 20;
$self->{priv} = 0 if $line =~ /^(ax|te)/; # set the connection priv to 0 - can be upgraded later
$self->{consort} = $line; # save the connection type
@@
-117,7
+118,7
@@
sub start
$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->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->
send($self->msg('pr', $call))
;
+ $self->
prompt
;
# decide on echo
if (!$user->wantecho) {
# decide on echo
if (!$user->wantecho) {
@@
-302,7
+303,7
@@
sub run_cmd
# split the command line up into parts, the first part is the command
my ($cmd, $args) = split /\s+/, $cmdline, 2;
# split the command line up into parts, the first part is the command
my ($cmd, $args) = split /\s+/, $cmdline, 2;
- $args = "" unless $args;
+ $args = "" unless
defined
$args;
if ($cmd) {
if ($cmd) {
@@
-314,7
+315,7
@@
sub run_cmd
my $acmd = CmdAlias::get_cmd($cmd);
if ($acmd) {
($cmd, $args) = split /\s+/, "$acmd $args", 2;
my $acmd = CmdAlias::get_cmd($cmd);
if ($acmd) {
($cmd, $args) = split /\s+/, "$acmd $args", 2;
- $args = "" unless $args;
+ $args = "" unless
defined
$args;
dbg('command', "aliased cmd: $cmd $args");
}
dbg('command', "aliased cmd: $cmd $args");
}
@@
-389,6
+390,12
@@
sub finish
my $conn = shift;
my $call = $self->call;
my $conn = shift;
my $call = $self->call;
+ # reset the redirection of messages back to 'normal' if we are the sysop
+ if ($call eq $main::myalias) {
+ my $node = DXNode->get($main::mycall) or die "$main::mycall not allocated in DXNode database";
+ $node->dxchan($DXProt::me);
+ }
+
# I was the last node visited
$self->user->node($main::mycall);
# I was the last node visited
$self->user->node($main::mycall);
@@
-426,7
+433,7
@@
sub finish
sub prompt
{
my $self = shift;
sub prompt
{
my $self = shift;
- $self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call));
+ $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]
}
# broadcast a message to all users [except those mentioned after buffer]