X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=4a81a585616318756a0832a539815c442d3e3bea;hb=324bd80ed4aef7e2636f5a03288788ce11ab2663;hp=262a4155c92cd4deab28b8f832cec1ac8e519cf4;hpb=cce161221036760959ff1d0b7628a55942bf558a;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 262a4155..4a81a585 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -5,7 +5,12 @@
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
 # $Id$
-# 
+#
+#
+# Notes for implementors:-
+#
+# PC28 field 11 is the RR required flag
+# PC28 field 12 is a VIA routing (ie it is a node call) 
 
 package DXMsg;
 
@@ -196,7 +201,7 @@ sub process
 						$ref->store($ref->{lines});
 						add_dir($ref);
 						my $dxchan = DXChannel->get($ref->{to});
-						$dxchan->send("New mail has arrived for you") if $dxchan;
+						$dxchan->msg('msgnew') if $dxchan;
 						Log('msg', "Message $ref->{msgno} from $ref->{from} received from $f[2] for $ref->{to}");
 					}
 				}
@@ -492,6 +497,11 @@ sub queue_msg
 		if ($ref->{private}) {
 			if ($ref->{'read'} == 0) {
 				$clref = DXCluster->get_exact($ref->{to});
+				unless ($clref) {             # otherwise look for a homenode
+					my $uref = DXUser->get($ref->{to});
+					my $hnode =  $uref->homenode if $uref;
+					$clref = DXCluster->get_exact($hnode) if $hnode;
+				}
 				if ($clref && !grep { $clref->{dxchan} == $_ } DXCommandmode::get_all) {
 					$dxchan = $clref->{dxchan};
 					$ref->start_msg($dxchan) if $clref && !get_busy($dxchan->call) && $dxchan->state eq 'normal';
@@ -519,6 +529,21 @@ sub queue_msg
 	}
 }
 
+# is there a message for me?
+sub for_me
+{
+	my $call = uc shift;
+	my $ref;
+	
+	foreach $ref (@msg) {
+		# is it for me, private and unread? 
+		if ($ref->{to} eq $call && $ref->{private}) {
+			return 1 if !$ref->{'read'};
+		}
+	}
+	return 0;
+}
+
 # start the message off on its travels with a PC28
 sub start_msg
 {
@@ -717,9 +742,9 @@ sub do_send_stuff
 			delete $loc->{lines};
 			delete $loc->{to};
 			delete $self->{loc};
-			$self->state('prompt');
 			$self->func(undef);
 			DXMsg::queue_msg(0);
+			$self->state('prompt');
 		} elsif ($line eq "\031" || uc $line eq "/ABORT" || uc $line eq "/QUIT") {
 			#push @out, $self->msg('sendabort');
 			push @out, "aborted";