X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fkill.pl;h=dd4760594a3effeb471af28634c0f07ae46d7b14;hb=b1de8d406cf0b76292d401c4b75f33fca86a822d;hp=fb58bc247c09655408dbb91193f7fe596c518e75;hpb=c73f18c7f4534761e29b51f3f0426f6f1f7a073b;p=spider.git diff --git a/cmd/kill.pl b/cmd/kill.pl index fb58bc24..dd476059 100644 --- a/cmd/kill.pl +++ b/cmd/kill.pl @@ -40,7 +40,7 @@ while (@f) { my $from = $1; my $to = $2; @refs = grep { !($self->priv < 5 && $_->to ne $call && $_->from ne $call) } DXMsg::get_all() unless @refs; - @refs = grep { $_->msgno >= $from && $_->msgno < $to } @refs; + @refs = grep { $_->msgno >= $from && $_->msgno <= $to } @refs; } elsif ($f =~ /^fr/io) { $f = shift @f; if ($f) { @@ -64,10 +64,10 @@ while (@f) { foreach $ref ( @refs) { Log('msg', "Message $ref->{msgno} from $ref->{from} to $ref->{to} deleted by $call"); if ($full) { - DXProt::broadcast_all_ak1a(DXProt::pc49($self->call, $ref->{subject}), $DXProt::me); + DXProt::broadcast_ak1a(DXProt::pc49($ref->{from}, $ref->{subject}), $DXProt::me); } $ref->del_msg; - push @out, "Message $ref->{msgno} deleted"; + push @out, $self->msg('m12', $ref->msgno); } return (1, @out);