From: minima <minima>
Date: Sat, 7 Jan 2006 17:47:22 +0000 (+0000)
Subject: fix new swearing code.
X-Git-Tag: R_1_52~45
X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?p=spider.git;a=commitdiff_plain;h=fb1f41921af1910c36bb1afaa2913feaf7e525b9

fix new swearing code.
---

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index f4a1b7ab..fe65cdb3 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -355,13 +355,12 @@ sub handle_32
 					push @words, [$_, @bad] if @bad;
 				}
 				if (@words) {
-					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}");
+					LogDbg('msg',"$ref->{from} swore: $ref->{to} origin: $ref->{origin} via " . $dxchan->call);
+					LogDbg('msg',"subject: $ref->{subject}");
 					for (@words) {
-						dbg("line: $_->[0] (using words: ". join(',',@{$_->[1]}).")");
-						Log('msg', "line: $_->[0] (using words: ". join(',',@{$_->[1]}).")");
+						my $r = $_;
+						my $line = shift @$r;
+						LogDbg('msg', "line: $line (using words: ". join(',', @$r).")");
 					}
 					$ref->stop_msg($fromnode);
 					return;
@@ -1114,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};