1. get rid of spurious uninitialised messages from DXHash

2. $censorpc = 1
3. unpad spotted callsigns in PC11

diff --git a/perl/DXHash.pm b/perl/DXHash.pm
index b97d54c79608a7f59faf6f1c152b2dc63a83e178..c809dfd3c6c0cd50ca41a8fed21734696c979077 100644 (file)
--- a/perl/DXHash.pm
+++ b/perl/DXHash.pm
@@ -29,7 +29,7 @@ sub new
 {
        my ($pkg, $name) = @_;
        my $s = readfilestr($main::data, $name);
-       my $self = eval $s;
+       my $self = eval $s if $s;
        dbg('err', "error in reading $name in DXHash $@") if $@;
        $self = bless {name => $name}, $pkg unless $self;
        return $self;

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 99fc85ce7e3c42723bec9a8c5da038f2d540beb9..455311e3fceac64163d920ceeb508111cafa52d7 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -46,7 +46,7 @@ $last_hour = time;                            # last time I did an hourly periodic update
 %pings = ();                    # outstanding ping requests outbound
 %rcmds = ();                    # outstanding rcmd requests outbound
 %nodehops = ();                 # node specific hop control
-$censorpc = 0;                                 # Do a BadWords::check on text fields and reject things
+$censorpc = 1;                                 # Do a BadWords::check on text fields and reject things
                                                                # loads of 'bad things'
 $baddx = new DXHash "baddx";
 $badspotter = new DXHash "badspotter";
@@ -357,6 +357,7 @@ sub normal
                        
                        # do some de-duping
                        $field[5] =~ s/^\s+//;      # take any leading blanks off
+                       $field[2] = unpad($field[2]);   # take off leading and trailing blanks from spotted callsign
                        if (Spot::dup($field[1], $field[2], $d, $field[5])) {
                                dbg('chan', "PCPROT: Duplicate Spot ignored\n");
                                return;