take only alphanum chars for dupe checking

diff --git a/Changes b/Changes
index c379770364f541705d21f8a56e2c2a8556d56a4f..3f5e94ab9531dc31b12d9fd92f5d475d5bcbf077 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 23Aug00=======================================================================
 1. Added persistant dupe file so that all dupes are stored here (including
 announces) - announces are now kept for 5 days (as default).
+2. limit the characters stored in a dupe for spots and announces
 20Aug00=======================================================================
 1. Added system Alias for set/nodxgrid => unset/dxgrid
 2. Add full individual checking for all PC protocol fields in all messages

diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 987b885d05bb06403559192714c947cc8ef4ac27..84aa55ed8b4158c92536c25178baf8d170125897 100644 (file)
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -26,6 +26,7 @@ sub dup
 
        chomp $text;
        unpad($text);
+       $text =~ s/[^ a-zA-Z0-9]//g;
        $text = substr($text, 0, $duplth) if length $text > $duplth; 
        my $dupkey = "A$to|$text";
        return DXDupe::check($dupkey, $main::systime + $dupage);

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 6e5efeafbe3246ab9c106479287316d3e3d014be..6b11228b58ac2b5849df2e7611401e8959012065 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1259,7 +1259,10 @@ sub send_announce
                                $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
                                
                        }
-               } elsif ($dxchan->is_user && $dxchan->{ann}) {
+               } elsif ($dxchan->is_user) {
+                       unless ($dxchan->{ann}) {
+                               next if $_[0] ne $main::myalias && $_[0] ne $main::mycall;
+                       }
                        next if $target eq 'SYSOP' && $dxchan->{priv} < 5;
                        my $buf = "$to$target de $_[0]: $text";
                        $buf .= "\a\a" if $dxchan->{beep};

diff --git a/perl/Spot.pm b/perl/Spot.pm
index e7a619e0c7e0e42b272b35e2ed1175d5ef3b7103..e06c6cee156960d632781c44caed8b75385693c4 100644 (file)
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -215,6 +215,7 @@ sub dup
        chomp $text;
        $text = substr($text, 0, $duplth) if length $text > $duplth; 
        unpad($text);
+       $text =~ s/[^ a-zA-Z0-9]//g;
        my $dupkey = "X$freq|$call|$d|$text";
        return DXDupe::check($dupkey, $main::systime+$dupage);
 }