mega-merge of major parts of mojo

[spider.git] / cmd / send.pl

diff --git a/cmd/send.pl b/cmd/send.pl
index e78aabd311eaf020852e52574aa1c54c7c340456..0fb91e10bc7ed3799f8f1014c50fe790b3304976 100644 (file)
--- a/cmd/send.pl
+++ b/cmd/send.pl
@@ -14,10 +14,11 @@
 # 
 # Copyright (c) Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 my ($self, $line) = @_;
-return (1, $self->msg('e5')) if $self->remotecmd;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
+return (1, $self->msg('e36')) unless $self->state =~ /^prompt/;
 
 my @out;
 my $loc = $self->{loc} = {};
@@ -38,7 +39,7 @@ if ($self->state eq "prompt") {
        
        # any thing after send?
        return (1, $self->msg('e6')) if !@f;
-       return (1, $self->msg('e28')) unless $self->registered || uc $f[0] eq $main::myalias;
+       return (1, $self->msg('e28')) unless $self->isregistered || uc $f[0] eq $main::myalias;
 
        while (@f) {
                my $f = uc shift @f;