X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=4f02d5193275b866d9577f3e31bc716d5420e1e8;hb=d4a6a5adbe851a38f46c2d67eda71718e85c4892;hp=e7f3c7c09b5e2debc7c0d29e447cdbf82766284c;hpb=44bab9382ffb0bf12639af84729d1c42ac4d9ae2;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index e7f3c7c0..4f02d519 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -67,8 +67,8 @@ $baddxfn = "$main::data/baddx.pl";
  [ qw(d n n n n m c c h) ],		# pc23
  [ qw(c p h) ],					# pc24
  [ qw(c c n n) ],				# pc25
- [ qw(f m d t m c c) ],			# pc26
- [ qw(d n n n n m c c) ],		# pc27
+ [ qw(f m d t m c c bc) ],		# pc26
+ [ qw(d n n n n m c c bc) ],	# pc27
  [ qw(c c c c d t p m bp n p bp bc) ], # pc28
  [ qw(c c n m) ],				# pc29
  [ qw(c c n) ],					# pc30
@@ -141,7 +141,7 @@ sub check
 	
 	my $i;
 	shift;    # not interested in the first field
-	for ($i = 0; $i < @_; $i++) {
+	for ($i = 0; $i < @$ref; $i++) {
 		my ($blank, $act) = $$ref[$i] =~ /^(b?)(\w)$/;
 		return 0 unless $act;
 		next if $blank && $_[$i] =~ /^[ \*]$/;
@@ -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};