force removal of ssid on badspotter

diff --git a/Changes b/Changes
index fbd324398e73ccf66e81c097d56ae528e47bb291..a485831248b508ca8485261d873bb5f5988cd89d 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+23Mar05=======================================================================
+1. fix (un)set/badspotter so that it only stores non-ssid calls.
+2. mention action on talk and ann/full in help.
 22Mar05=======================================================================
 1. Fix ? so it works again.
 2. Fix Aliases for sh/c so they are correct

diff --git a/cmd/Commands_en.hlp b/cmd/Commands_en.hlp
index 9e3982cba91851b2ceb1fd28c78e72d95d95a5f6..342630a45d31931a3e7460fbe0a4e41ca65a19c8 100644 (file)
--- a/cmd/Commands_en.hlp
+++ b/cmd/Commands_en.hlp
@@ -1429,6 +1429,9 @@ will allow spots from him again.
 
 Use with extreme care. This command may well be superceded by FILTERing.
 
+This command will also stop TALK and ANNOUNCE/FULL from any user marked
+as a BADSPOTTER.
+
 === 8^SET/BADWORD <word>..^Stop things with this word being propagated
 === 8^UNSET/BADWORD <word>..^Propagate things with this word again
 Setting a word as a 'badword' will prevent things like spots,

diff --git a/cmd/set/badspotter.pl b/cmd/set/badspotter.pl
index 6478c6f1ff6770df21d6297333ee24fdca07d694..669a4ab5eca7c4e470e89d434cbe277d3c099bcf 100644 (file)
--- a/cmd/set/badspotter.pl
+++ b/cmd/set/badspotter.pl
@@ -6,5 +6,6 @@
 # $Id$
 #
 my ($self, $line) = @_;
+$line = join(' ', map {s|[/-]\d+$||; $_} split(/\s+/, $line));
 return $DXProt::badspotter->set(8, $self->msg('e6'), $self, $line);
 

diff --git a/cmd/unset/badspotter.pl b/cmd/unset/badspotter.pl
index 5664f1cb207fdbad84edeaf6ba6e48f51eaadf75..5c2433e9289d00703cfdc25682ac15a4cfa33770 100644 (file)
--- a/cmd/unset/badspotter.pl
+++ b/cmd/unset/badspotter.pl
@@ -6,5 +6,6 @@
 # $Id$
 #
 my ($self, $line) = @_;
+$line = join(' ', map {s|[/-]\d+$||; $_} split(/\s+/, $line));
 return $DXProt::badspotter->unset(8, $self->msg('e6'), $self, $line);