mega-merge of major parts of mojo

[spider.git] / cmd / talk.pl

diff --git a/cmd/talk.pl b/cmd/talk.pl
index 2d1fbb9ef27d402c1e441d2731951aa6c9d56a96..dae38e243be0d56b8f1378fd57e8f4bcf067e28b 100644 (file)
--- a/cmd/talk.pl
+++ b/cmd/talk.pl
@@ -1,5 +1,5 @@
 #
-# The talk command
+# The talk command (improved)
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
@@ -32,15 +32,14 @@ return (1, $self->msg('e8')) unless $to;
 
 $to = uc $to;
 
-return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 return (1, $self->msg('e22', $to)) unless is_callsign($to);
-return (1, $self->msg('e28')) unless $self->registered || $to eq $main::myalias;
+return (1, $self->msg('e28')) unless $self->isregistered || $to eq $main::myalias;
 
 $via = uc $via if $via;
 my $call = $via || $to;
 my $clref = Route::get($call);     # try an exact call
 my $dxchan = $clref->dxchan if $clref;
-#return (1, $self->msg('e7', $call)) unless $dxchan;
+push @out, $self->msg('e7', $call) unless $dxchan;
 
 #$DB::single = 1;