X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=f60b59038e274f77b6468b85886ab1c998c9a8c0;hb=47bc13ac2b52dd67972c24017d7f6a41ac601611;hp=04239f16b6777581ade86c2cb0f036f087d1f42b;hpb=9971e7bd96ea646b7921528a2f74edca508a5dc1;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 04239f16..f60b5903 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -26,6 +26,10 @@ use DXLog;
 use IO::File;
 use Fcntl;
 
+eval {
+	require Mail::Send;
+};
+
 use strict;
 
 use vars qw($VERSION $BRANCH);
@@ -322,9 +326,8 @@ sub process
 						$ref->{msgno} = next_transno("Msgno");
 						push @{$ref->{gotit}}, $fromnode; # mark this up as being received
 						$ref->store($ref->{lines});
+						$ref->notify;
 						add_dir($ref);
-						my $dxchan = DXChannel->get($ref->{to});
-						$dxchan->send($dxchan->msg('m9')) if $dxchan && $dxchan->is_user;
 						Log('msg', "Message $ref->{msgno} from $ref->{from} received from $fromnode for $ref->{to}");
 					}
 				}
@@ -418,6 +421,30 @@ sub process
 }
 
 
+sub notify
+{
+	my $ref = shift;
+	my $to = $ref->{to};
+	my $uref = DXUser->get($to);
+	my $dxchan = DXChannel->get($to);
+	if (*Mail::Send && $uref && $uref->wantemail) {
+		my $email = $uref->email;
+		if ($email) {
+			my @list = ref $email ? @{$email} : $email;
+			my $msg = new Mail::Send Subject=>"[DXSpider: $ref->{from}] $ref->{subject}";
+			$msg->to(@list);
+			my $fh = $msg->open;
+			print $fh "From: $ref->{from} To: $to On Node: $main::mycall Origin: $ref->{origin} Msgno: $ref->{msgno}\r\n\r\n";
+			print $fh map {"$_\r\n"} $ref->read_msg_body;
+			$fh->close;
+			for (@list) {
+				Log('msg', "Msgno $ref->{msgno} from $ref->{from} emailed to $_");
+			}
+		}
+	}
+	$dxchan->send($dxchan->msg('m9')) if $dxchan && $dxchan->is_user;
+}
+
 # store a message away on disc or whatever
 #
 # NOTE the second arg is a REFERENCE not a list
@@ -990,12 +1017,7 @@ sub do_send_stuff
 					$ref->add_dir();
 					push @out, $self->msg('m11', $ref->{msgno}, $to);
 					#push @out, "msgno $ref->{msgno} sent to $to";
-					my $dxchan = DXChannel->get(uc $to);
-					if ($dxchan) {
-						if ($dxchan->is_user()) {
-							$dxchan->send($dxchan->msg('m9'));
-						}
-					}
+					$ref->notify;
 				}
 			} else {
 				Log('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
@@ -1366,12 +1388,7 @@ sub import_one
 			$mref->add_dir();
 			push @out, $dxchan->msg('m11', $mref->{msgno}, $to);
 			#push @out, "msgno $ref->{msgno} sent to $to";
-			my $todxchan = DXChannel->get(uc $to);
-			if ($todxchan) {
-				if ($todxchan->is_user()) {
-					$todxchan->send($todxchan->msg('m9'));
-				}
-			}
+			$mref->notify;
 		}
 	}
 	return @out;