X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fclear%2Fannounce.pl;h=98fb5b873104f040ea812bee4ae09c391457509c;hb=17d726014561756adf9fa40a68940bcd88e5f7b3;hp=5ee0b4247f91fb6996b601043feb687fc29974db;hpb=6ccc3a6e864a2fee18786a7070400c7c4f22cf7c;p=spider.git

diff --git a/cmd/clear/announce.pl b/cmd/clear/announce.pl
index 5ee0b424..98fb5b87 100644
--- a/cmd/clear/announce.pl
+++ b/cmd/clear/announce.pl
@@ -3,22 +3,21 @@
 #
 # Copyright (c) 2000 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
 my @out;
-my $dxchan = $self;
 my $sort = 'ann';
 my $flag;
 my $fno = 1;
-my $call = $dxchan->call;
+my $call = $self->call;
 my $f;
 
 if ($self->priv >= 8) {
 	if (@f && is_callsign(uc $f[0])) {
 		$f = uc shift @f;
-		my $uref = DXUser->get($f);
+		my $uref = DXUser::get($f);
 		$call = $uref->call if $uref;
 	} elsif (@f && lc $f[0] eq 'node_default' || lc $f[0] eq 'user_default') {
 		$call = lc shift @f;
@@ -31,8 +30,8 @@ if ($self->priv >= 8) {
 
 $fno = shift @f if @f && $f[0] =~ /^\d|all$/;
 
-my $filter = Filter::read_in($sort, $call, $flag);
-Filter::delete($sort, $call, $flag, $fno);
+my $filter =  Filter::read_in($sort, $call, $flag);
+Filter::delete($sort, $call, $flag, $fno, $self);
 $flag = $flag ? "input " : "";
 push @out, $self->msg('filter4', $flag, $sort, $fno, $call);
 return (1, @out);