From: minima Date: Fri, 2 Mar 2001 13:30:25 +0000 (+0000) Subject: 1. get rid of spurious uninitialised messages from DXHash X-Git-Tag: R_1_47_PRE1~3 X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=5b602b76c1409d411a4dc51babc207a7cc241513;p=spider.git 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 b97d54c7..c809dfd3 100644 --- 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 99fc85ce..455311e3 100644 --- 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;