fix console.pl max scroll depth

[spider.git] / cmd / read.pl

diff --git a/cmd/read.pl b/cmd/read.pl
index a1352724bb486a95997cea6e3bb1ab90a60da767..076e8dde7dd2ce277ff890d298f5e54b88d1c755 100644 (file)
--- a/cmd/read.pl
+++ b/cmd/read.pl
@@ -3,7 +3,7 @@
 #
 # Copyright (c) Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -16,39 +16,58 @@ my $ref;
 # if there are no specified message numbers, try and find a private one
 # that I haven't read yet
 if (@f == 0) {
-  foreach $ref (DXMsg::get_all()) {
-       if ($ref->to eq $self->call && $ref->private && !$ref->read) {
-         push @f, $ref->msgno;
-         last;
+       foreach $ref (DXMsg::get_all()) {
+               if ($ref->to eq $self->call && $ref->private && !$ref->read && !$ref->delete) {
+                       push @f, $ref->msgno;
+                       last;
+               }
        }
-  }
 }
 
-return (1, "Sorry, no new messages for you") if @f == 0;
+return (1, $self->msg('read1')) if @f == 0;
 
 for $msgno (@f) {
-  $ref = DXMsg::get($msgno);
-  if (!$ref) {
-    push @out, "Msg $msgno not found";
-       next;
-  }
-  if ($self->priv < 5 && $ref->private && $ref->to ne $self->call && $ref->from ne $self->call ) {
-    push @out, "Msg $msgno not available";
-       next;
-  }
-  push @out, sprintf "Msg: %d From: %s Date: %6.6s %5.5s Subj: %-30.30s", $msgno,
-                     $ref->from, cldate($ref->t), ztime($ref->t), $ref->subject;
-  @body = $ref->read_msg_body;
-  push @out, @body;
-  
-  # mark my privates as read
-  if ($ref->private && $self->call eq $ref->to && $ref->read == 0) {
-    $ref->read(1);
-    $ref->store(\@body);    # note call by reference!
-  }
-  
-  # remember this one as the last one read
-  $self->lastread($msgno);
+       $ref = DXMsg::get($msgno);
+       if (!$ref) {
+               push @out, $self->msg('read2', $msgno);
+               next;
+       }
+       if ($self->priv < 5 && $ref->private && $ref->to ne $self->call && $ref->from ne $self->call ) {
+               push @out, $self->msg('read3', $msgno);
+               next;
+       }
+       push @out, sprintf "Msg: %d From: %s Date: %6.6s %5.5s Subj: %-30.30s", $msgno,
+               $ref->from, cldate($ref->t), ztime($ref->t), $ref->subject;
+       @body = $ref->read_msg_body;
+       push @out, @body;
+       
+       # mark it as read
+       unless ($ref->private && $ref->to ne $self->call) {
+               $ref->read($ref->read() + 1);
+               $ref->store(\@body);    # note call by reference!
+
+               # if it had a read receipt on it generate a new message to send back to
+               # the sender.
+               if ($ref->rrreq) {
+                       my $sub = $ref->subject;
+                       $sub = "Re: $sub" unless $sub =~ /^\s*re:/i;
+                       my $to = $ref->to;
+                       my $from = $ref->from;
+                       my $rref = DXMsg->alloc(1, $from, $main::mycall, time, 
+                                                                       1, $sub, $main::mycall, 0, 0 );
+                       my $msgno = DXMsg::next_transno("Msgno");
+                       $rref->msgno($msgno);
+                       $rref->gotit( [ "$main::mycall" ] );
+                       $rref->store( [ "Return receipt from delivering node. Message read by $to." ] );
+                       DXMsg::add_dir($rref);
+                       DXMsg::queue_msg(0);
+               }
+       
+               # remember this one as the last one read
+               $self->lastread($msgno);
+       }
 }
 
 return (1, @out);
+
+