mega-merge of major parts of mojo

[spider.git] / cmd / reply.pl

diff --git a/cmd/reply.pl b/cmd/reply.pl
index 6982eb599e57993faf17a618f292388c83e4b846..22f04b85bd98d9570318a4f861566c0f0887768e 100644 (file)
--- a/cmd/reply.pl
+++ b/cmd/reply.pl
@@ -14,7 +14,7 @@
 # 
 # Copyright (c) Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 my ($self, $line) = @_;
 my @out;
@@ -28,47 +28,48 @@ if ($self->state eq "prompt") {
        
        # now deal with real message inputs 
        # parse out send line for various possibilities
-       $loc = $self->{loc} = {};
+       $loc = {};
        
        my $i = 0;
+       my @extra = ();
+       my $msgno = $self->lastread;
        $loc->{private} = '1';
-       if ($i < @f) {
-               if ($f[0] =~ /^(B|NOP)/oi) {
+       $loc->{rrreq} = '0';
+       while (@f) {
+               my $w = shift @f;
+               if ($w =~ /^\d+$/) {
+                       $msgno = $w;
+               } elsif ($w =~ /^(B|NOP)/i) {
                        $loc->{private} = '0';
-                       $i += 1;
-               } elsif ($f[0] =~ /^P/oi) {
-                       $i += 1;
-               }
-       }
-       
-       if ($i < @f) {
-               $loc->{rrreq} = '0';
-               if (uc $f[$i] eq 'RR') {
+               } elsif ($w =~ /^P/i) {
+                       ;
+               } elsif (uc $w eq 'RR') {
                        $loc->{rrreq} = '1';
-                       $i++;
+               } else {
+                       push @extra, uc $w;
                }
        }
+       
        my $oref; 
        
        # check we have a reply number
        #  $DB::single = 1;
        
-       if ($i < @f) {
-               $oref = DXMsg::get($f[$i]);
-               if (!$oref) {
-                       delete $self->{loc};
-                       return (1, $self->msg('m4', $i));
-               }
-       } else {
-               if (!($oref = DXMsg::get($self->lastread))) {
-                       delete $self->{loc};
-                       return (1, $self->msg('m5'));
-               }
-       }
+       $oref = DXMsg::get($msgno) if $msgno;
+       return (1, $self->msg('m4', $i)) unless $oref;
        
        # now save all the 'to' callsigns for later
-       my $to = $loc->{private} ? $oref->from : $oref->to;
-       $loc->{to} = [ $to ];       # to is an array
+       my $to;
+       if ($loc->{private}) {
+               $to = $oref->from;
+       } else {
+               $to = $oref->to;
+               @extra = ();
+       } 
+
+       return (1, $self->msg('e28')) unless $self->isregistered || $to eq $main::myalias;
+       
+       $loc->{to} = [ $to, @extra ];       # to is an array
        $loc->{subject} = $oref->subject;
        $loc->{subject} = "Re: " . $loc->{subject} if !($loc->{subject} =~ /^Re:\s/io); 
        
@@ -76,7 +77,8 @@ if ($self->state eq "prompt") {
        # keep calling me for every line until I relinquish control
        $self->func("DXMsg::do_send_stuff");
        $self->state('sendbody');
-       push @out, $self->msg('m6', $to);
+       $self->loc($loc);
+       push @out, $self->msg('m6', join(',', $to, @extra));
        push @out, $self->msg('m7', $loc->{subject});
        push @out, $self->msg('m8');
 }