made the censoring of PC10,11,12 optional with $censorpc = 0

diff --git a/Changes b/Changes
index 3a2a8759e1ef294d336d86b9003debc7d6dd3e00..830d3fd95c241e6a71ee7a6b5803a949af764c1e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+04Sep00=======================================================================
+1. made PC10,11,12 badword checking dependant on a flag variable ($censorpc)
+default = 0 (off).
 02Sep00=======================================================================
 1. fix a long standing talk bug to do with routing to specific nodes (t xxx >
 yyy .....)

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index cd731a216fbcd64866720cb70c0c841bbdcedf2c..60e0391f2e34e7e3bb73a061e40b7d0b274a9ea6 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -34,7 +34,7 @@ use BadWords;
 use strict;
 use vars qw($me $pc11_max_age $pc23_max_age
                        $last_hour %pings %rcmds
-                       %nodehops @baddx $baddxfn 
+                       %nodehops @baddx $baddxfn $censorpc
                        $allowzero $decode_dk0wcy $send_opernam @checklist);
 
 $me = undef;                                   # the channel id for this cluster
@@ -46,7 +46,7 @@ $last_hour = time;                            # last time I did an hourly periodic update
 %rcmds = ();                    # outstanding rcmd requests outbound
 %nodehops = ();                 # node specific hop control
 @baddx = ();                    # list of illegal spotted callsigns
-
+$censorpc = 0;                                 # Do a BadWords::check on text fields and reject things
 
 $baddxfn = "$main::data/baddx.pl";
 
@@ -297,10 +297,12 @@ sub normal
                if ($pcno == 10) {              # incoming talk
 
                        # will we allow it at all?
-                       my @bad;
-                       if (@bad = BadWords::check($field[3])) {
-                               dbg('chan', "Bad words: @bad, dropped" );
-                               return;
+                       if ($censorpc) {
+                               my @bad;
+                               if (@bad = BadWords::check($field[3])) {
+                                       dbg('chan', "Bad words: @bad, dropped" );
+                                       return;
+                               }
                        }
 
                        # is it for me or one of mine?
@@ -357,10 +359,12 @@ sub normal
                                dbg('chan', "Duplicate Spot ignored\n");
                                return;
                        }
-                       my @bad;
-                       if (@bad = BadWords::check($field[5])) {
-                               dbg('chan', "Bad words: @bad, dropped" );
-                               return;
+                       if ($censorpc) {
+                               my @bad;
+                               if (@bad = BadWords::check($field[5])) {
+                                       dbg('chan', "Bad words: @bad, dropped" );
+                                       return;
+                               }
                        }
                        
                        my @spot = Spot::add($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
@@ -439,11 +443,14 @@ sub normal
                                return;
                        }
 
-                       my @bad;
-                       if (@bad = BadWords::check($field[3])) {
-                               dbg('chan', "Bad words: @bad, dropped" );
-                               return;
+                       if ($censorpc) {
+                               my @bad;
+                               if (@bad = BadWords::check($field[3])) {
+                                       dbg('chan', "Bad words: @bad, dropped" );
+                                       return;
+                               }
                        }
+                       
                        if ($field[2] eq '*' || $field[2] eq $main::mycall) {
                                
                                # global ann filtering on INPUT