X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fread.pl;h=9d57307fa80b2edf78a285ec49275ee168dfd6ae;hb=c71a54705682b0a66d6729af5f043dc2c2df276a;hp=1845b4d1516720ddf97951871791aa216dcd49de;hpb=47bc13ac2b52dd67972c24017d7f6a41ac601611;p=spider.git

diff --git a/cmd/read.pl b/cmd/read.pl
index 1845b4d1..9d57307f 100644
--- a/cmd/read.pl
+++ b/cmd/read.pl
@@ -17,7 +17,7 @@ my $ref;
 # that I haven't read yet
 if (@f == 0) {
 	foreach $ref (DXMsg::get_all()) {
-		if ($ref->to eq $self->call && $ref->private && !$ref->read) {
+		if ($ref->to eq $self->call && $ref->private && !$ref->read && !$ref->delete) {
 			push @f, $ref->msgno;
 			last;
 		}
@@ -42,28 +42,30 @@ for $msgno (@f) {
 	push @out, @body;
 	
 	# mark it as read
-	$ref->read($ref->read() + 1);
-	$ref->store(\@body);    # note call by reference!
+	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);
-	}
+		# 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);
+		# remember this one as the last one read
+		$self->lastread($msgno);
+	}
 }
 
 return (1, @out);