X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Freply.pl;h=6982eb599e57993faf17a618f292388c83e4b846;hb=465426f9282b990ec3462c63e5ca7613f92fb290;hp=c5ceaddf9a26c08bd746ff44f4428ebfe42fe54f;hpb=337f38bfac57a5e5df34c63094fb869b0e2f6bee;p=spider.git diff --git a/cmd/reply.pl b/cmd/reply.pl index c5ceaddf..6982eb59 100644 --- a/cmd/reply.pl +++ b/cmd/reply.pl @@ -57,18 +57,17 @@ if ($self->state eq "prompt") { $oref = DXMsg::get($f[$i]); if (!$oref) { delete $self->{loc}; - return (0, "can't access message $i"); + return (1, $self->msg('m4', $i)); } } else { if (!($oref = DXMsg::get($self->lastread))) { delete $self->{loc}; - #return (0, $self->msg('esend2')); - return (0, "need a message number"); + return (1, $self->msg('m5')); } } # now save all the 'to' callsigns for later - my $to = $oref->from; + my $to = $loc->{private} ? $oref->from : $oref->to; $loc->{to} = [ $to ]; # to is an array $loc->{subject} = $oref->subject; $loc->{subject} = "Re: " . $loc->{subject} if !($loc->{subject} =~ /^Re:\s/io); @@ -77,10 +76,9 @@ 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('sendsubj'); - push @out, "Reply to: $to"; - push @out, "Subject : $loc->{subject}"; - push @out, "Enter Message /EX (^Z) to send or /ABORT (^Y) to exit"; + push @out, $self->msg('m6', $to); + push @out, $self->msg('m7', $loc->{subject}); + push @out, $self->msg('m8'); } return (1, @out);