From: minima <minima>
Date: Wed, 23 Aug 2000 21:48:01 +0000 (+0000)
Subject: take only alphanum chars for dupe checking
X-Git-Tag: R_1_44~19
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=781531dd3ee37e69c75e52718e0b26bcac31ca1c;p=spider.git

take only alphanum chars for dupe checking
---

diff --git a/Changes b/Changes
index c3797703..3f5e94ab 100644
--- 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 987b885d..84aa55ed 100644
--- 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 6e5efeaf..6b11228b 100644
--- 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 e7a619e0..e06c6cee 100644
--- 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);
 }