tidy up listdups so regexes now work again

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 6e5efeafbe3246ab9c106479287316d3e3d014be..4f02d5193275b866d9577f3e31bc716d5420e1e8 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -422,7 +422,7 @@ sub normal
                        # announce duplicate checking
                        $field[3] =~ s/^\s+//;  # remove leading blanks
                        if (AnnTalk::dup($field[1], $field[2], $field[3])) {
-                               dbg('chan', "Duplicate Announce ignored\n");
+                               dbg('chan', "Duplicate Announce ignored");
                                return;
                        }
                        
@@ -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};