X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=fe65cdb3b204667d1931113c4036f6583fcd56a8;hb=7f8810e2112b1fa4a68472c265a71906e7dcccd3;hp=5190b6b6cc49dd3ac5e9b1e66eeb2efa85e04616;hpb=7b10171a637c3aef830d309b27739cf4aeba939b;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 5190b6b6..fe65cdb3 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -33,8 +33,10 @@ eval {
 use strict;
 
 use vars qw($VERSION $BRANCH);
-
-main::mkver($VERSION = q$Revision$);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
 
 use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean $residencetime
 			@badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime
@@ -344,17 +346,21 @@ sub handle_32
 				}
 
 				# check the message for bad words 
+				my @bad;
 				my @words;
+				@bad = BadWords::check($ref->{subject});
+				push @words, [$ref->{subject}, @bad] if @bad; 
 				for (@{$ref->{lines}}) {
-					push @words, BadWords::check($_);
+					@bad = BadWords::check($_);
+					push @words, [$_, @bad] if @bad;
 				}
-				push @words, BadWords::check($ref->{subject});
 				if (@words) {
-					dbg("$ref->{from} swore: '@words' -> $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $dxchan->call) if isdbg('msg');
-					Log('msg',"$ref->{from} swore: '@words' -> $ref->{to} origin: $ref->{origin} via " . $dxchan->call);
-					Log('msg',"subject: $ref->{subject}");
-					for (@{$ref->{lines}}) {
-						Log('msg', "line: $_");
+					LogDbg('msg',"$ref->{from} swore: $ref->{to} origin: $ref->{origin} via " . $dxchan->call);
+					LogDbg('msg',"subject: $ref->{subject}");
+					for (@words) {
+						my $r = $_;
+						my $line = shift @$r;
+						LogDbg('msg', "line: $line (using words: ". join(',', @$r).")");
 					}
 					$ref->stop_msg($fromnode);
 					return;
@@ -1107,7 +1113,7 @@ sub do_send_stuff
 					$ref->notify;
 				}
 			} else {
-				Log('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
+				LogDbg('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
 			}
 			
 			delete $loc->{lines};