X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=bf7494a7ef53a20c91dbecd695e01c3724b1f4ee;hb=refs%2Fheads%2Fmojo;hp=174a98a4792697ee7513f8298c03e7710b97d671;hpb=ef77e5488c4cc47afe272f6220cc3fa0cddc5829;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 174a98a4..bf7494a7 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -66,30 +66,30 @@ $importfn = "$msgdir/import";       # import directory
 
 
 %valid = (
-		  fromnode => '5,From Node',
-		  tonode => '5,To Node',
-		  to => '0,To',
-		  from => '0,From',
-		  t => '0,Msg Time,cldatetime',
-		  private => '5,Private,yesno',
-		  subject => '0,Subject',
-		  linesreq => '0,Lines per Gob',
-		  rrreq => '5,Read Confirm,yesno',
-		  origin => '0,Origin',
-		  lines => '5,Data',
-		  stream => '9,Stream No',
+		  'read' => '5,Times read',
 		  count => '5,Gob Linecnt',
+		  delete => '5,Awaiting Delete,yesno',
+		  deletetime => '5,Deletion Time,cldatetime',
 		  file => '5,File?,yesno',
+		  from => '0,From',
+		  fromnode => '5,From Node',
 		  gotit => '5,Got it Nodes,parray',
-		  lines => '5,Lines,parray',
-		  'read' => '5,Times read',
-		  size => '0,Size',
-		  msgno => '0,Msgno',
 		  keep => '0,Keep this?,yesno',
 		  lastt => '5,Last processed,cldatetime',
+		  lines => '5,Data',
+		  lines => '5,Lines,parray',
+		  linesreq => '0,Lines per Gob',
+		  msgno => '0,Msgno',
+		  origin => '0,Origin',
+		  private => '5,Private,yesno',
+		  rrreq => '5,Read Confirm,yesno',
+		  size => '0,Size',
+		  stream => '9,Stream No',
+		  subject => '0,Subject',
+		  t => '0,Msg Time,cldatetime',
+		  to => '0,To',
+		  tonode => '5,To Node',
 		  waitt => '5,Wait until,cldatetime',
-		  delete => '5,Awaiting Delete,yesno',
-		  deletetime => '5,Deletion Time,cldatetime',
 		 );
 
 # fix up the default sendmail if available
@@ -485,7 +485,7 @@ sub notify
 			my $fromaddr = $email_from || $main::myemail;
 			my @headers = ("To: $ref->{to}", 
 						   "From: $fromaddr",
-						   "Subject: [DXSpider: $ref->{from}] $ref->{subject}", 
+						   "Subject: [DXSpider: $ref->{from}\@$ref->{origin}] $ref->{subject}", 
 						   "X-DXSpider-To: $ref->{to}",
 						   "X-DXSpider-From: $ref->{from}\@$ref->{origin}", 
 						   "X-DXSpider-Gateway: $main::mycall"