slightly improve logging of badword messages

[spider.git] / perl / DXMsg.pm

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index bb8cbb68331692ce272df62b938c94c54e27f6bd..dc9aff9197548ec2ca8c2650746c6a79e7404c1a 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -69,10 +69,10 @@ $importfn = "$msgdir/import";       # import directory
                  to => '0,To',
                  from => '0,From',
                  t => '0,Msg Time,cldatetime',
-                 private => '5,Private',
+                 private => '5,Private,yesno',
                  subject => '0,Subject',
                  linesreq => '0,Lines per Gob',
-                 rrreq => '5,Read Confirm',
+                 rrreq => '5,Read Confirm,yesno',
                  origin => '0,Origin',
                  lines => '5,Data',
                  stream => '9,Stream No',
@@ -305,8 +305,8 @@ sub process
                                                }
                                                push @words, BadWords::check($ref->{subject});
                                                if (@words) {
-                                                       dbg("message with badwords '@words' $ref->{from} -> $ref->{to} '$ref->{subject}' origin: $ref->{origin}") if isdbg('msg');
-                                                       Log('msg',"message with badwords '@words' $ref->{from} -> $ref->{to} origin: $ref->{origin}");
+                                                       dbg("message with badwords '@words' $ref->{from} -> $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $self->call) if isdbg('msg');
+                                                       Log('msg',"message with badwords '@words' $ref->{from} -> $ref->{to} origin: $ref->{origin} via " . $self->call);
                                                        Log('msg',"subject: $ref->{subject}");
                                                        for (@{$ref->{lines}}) {
                                                                Log('msg', "line: $_");
@@ -886,6 +886,7 @@ sub do_send_stuff
                confess "local var gone missing" if !ref $self->{loc};
                my $loc = $self->{loc};
                if (my @ans = BadWords::check($line)) {
+                       $self->{badcount} += @ans;
                        Log('msg', $self->call . " used badwords: @ans to @{$loc->{to}} in msg");
                        return ($self->msg('e17', @ans), $self->msg('m1'));
                }
@@ -942,6 +943,7 @@ sub do_send_stuff
                        $self->state('prompt');
                } else {
                        if (my @ans = BadWords::check($line)) {
+                               $self->{badcount} += @ans;
                                Log('msg', $self->call . " used badwords: @ans to @{$loc->{to}} subject: '$loc->{subject}' in msg");
                                Log('msg', "line: $line");
                                return ($self->msg('e17', @ans));