From: djk Date: Thu, 21 Oct 1999 11:11:07 +0000 (+0000) Subject: fixed reply so that reply b / nop send replies as bulls X-Git-Tag: R_1_32~8 X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=fe322eb02369fded6defe0f3fa7ae6530496ef9c;p=spider.git fixed reply so that reply b / nop send replies as bulls --- diff --git a/Changes b/Changes index 2a0bcaad..e04ef39d 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,6 @@ +21Oct99======================================================================= +1. fixed reply so that reply b or reply nop generate a bulletin with the +correct address. 20Oct99======================================================================= 1. Translated all the subroutines of minimuf into perl as Minimuf.pm 2. Limited the length of an ANN that is saved for de-duping to $pc12_dup_lth diff --git a/cmd/Commands_en.hlp b/cmd/Commands_en.hlp index 30a1f602..d789a51e 100644 --- a/cmd/Commands_en.hlp +++ b/cmd/Commands_en.hlp @@ -260,15 +260,16 @@ message either sent by or sent to your callsign. === 5^READ-^ As a sysop you may read any message on the system -=== 0^REPLY^Reply to the last message that you have read -=== 0^REPLY ^Reply to the specified message -=== 0^REPLY PRIVATE ^Reply privately to the specified message +=== 0^REPLY^Reply (privately) to the last message that you have read +=== 0^REPLY ^Reply (privately) to the specified message +=== 0^REPLY B ^Reply as a Bulletin to the specified message +=== 0^REPLY NOPrivate ^Reply as a Bulletin to the specified message === 0^REPLY RR ^Reply to the specified message with read receipt You can reply to a message and the subject will automatically have "Re:" inserted in front of it, if it isn't already present. You can also use all the extra qualifiers such as RR, PRIVATE, -NOPRIVATE that you can use with the SEND command (see SEND +NOPRIVATE, B that you can use with the SEND command (see SEND for further details) === 0^SEND [ ...]^Send a message to one or more callsigns diff --git a/cmd/reply.pl b/cmd/reply.pl index c8ef615d..6982eb59 100644 --- a/cmd/reply.pl +++ b/cmd/reply.pl @@ -63,12 +63,11 @@ if ($self->state eq "prompt") { if (!($oref = DXMsg::get($self->lastread))) { delete $self->{loc}; return (1, $self->msg('m5')); - #return (1, "need a message number"); } } # 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,6 @@ 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'); diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 6d2a7231..a28d36f5 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -308,8 +308,9 @@ sub normal Log('ann', $target, $field[1], $text); if ($decode_dk0wcy && $field[1] eq $decode_dk0wcy) { - my ($hour, $k, $next, $a, $r, $sfi) = $field[3] =~ /^Aurora Beacon\s+(\d+)UTC,\s+Kiel\s+K=(\d+),.*ed\s+K=(\d+),\s+A=(\d+),\s+R=(\d+),\s+SFI=(\d+),/; - my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next", $decode_dk0wcy, $field[5], $r); + my ($hour, $k, $next, $a, $r, $sfi, $alarm) = $field[3] =~ /^Aurora Beacon\s+(\d+)UTC,\s+Kiel\s+K=(\d+),.*ed\s+K=(\d+),\s+A=(\d+),\s+R=(\d+),\s+SFI=(\d+),.*larm:\s+(\w+)/; + $alarm = ($alarm =~ /^Y/i) ? ', Aurora in DE' : ''; + my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next$alarm", $decode_dk0wcy, $field[5], $r); } return if $field[2] eq $main::mycall; # it's routed to me