X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXMsg.pm;h=f4a1b7aba0e66dd6818d288e1e229b90d03a30b3;hb=cbf3c0cd90df4c4df05dae6a00d03f7f9482d631;hp=b25b70a5b704c57f02ba863d88ca406a6bbdf651;hpb=dab8b370e48c980fa354dedd17d5a0c75b481862;p=spider.git

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index b25b70a5..f4a1b7ab 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -346,17 +346,22 @@ 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);
+					dbg("$ref->{from} swore: $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $dxchan->call) if isdbg('msg');
+					Log('msg',"$ref->{from} swore: $ref->{to} origin: $ref->{origin} via " . $dxchan->call);
+				    dbg("subject: $ref->{subject}");
 					Log('msg',"subject: $ref->{subject}");
-					for (@{$ref->{lines}}) {
-						Log('msg', "line: $_");
+					for (@words) {
+						dbg("line: $_->[0] (using words: ". join(',',@{$_->[1]}).")");
+						Log('msg', "line: $_->[0] (using words: ". join(',',@{$_->[1]}).")");
 					}
 					$ref->stop_msg($fromnode);
 					return;