X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fkill.pl;h=b98a42f69b2c5d3947e58e5d5e0e6cc0a92d9a0a;hb=1283d7c748715a1bf85a781fe4b66f427d949ae9;hp=82e229756f5bc20e9f07df99087537180413467c;hpb=64b4171276c84a8df58776608dd9f568adef27b2;p=spider.git

diff --git a/cmd/kill.pl b/cmd/kill.pl
index 82e22975..b98a42f6 100644
--- a/cmd/kill.pl
+++ b/cmd/kill.pl
@@ -6,41 +6,70 @@
 # $Id$
 #
 
+use strict;
+
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
 my $msgno;
 my @out;
 my @body;
 my $ref;
+my @refs;
 my $call = $self->call;
 my $full;
 
-if ($f[0] =~ /^f/io) {
-	return (1, $self->msg('e5')) if $self->priv < 5;
-	$full = 1;
-	shift @f;
-}
-
 # $DB::single = 1;
 
-for $msgno (@f) {
-  $ref = DXMsg::get($msgno);
-  if (!$ref) {
-    push @out, "Msg $msgno not found";
-	next;
-  }
-  if ($self->priv < 5 && 
-      (($ref->private && $ref->to ne $self->call && $ref->from ne $self->call) ||
-      ($ref->private == 0  && $ref->from ne $self->call))) {
-    push @out, "Msg $msgno not available";
-	next;
-  } 
-  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);
-  }
-  $ref->del_msg;
-  push @out, "Message $msgno deleted";
+while (@f) {
+	my $f = shift @f;
+	if ($f =~ /^fu/io) {
+		return (1, $self->msg('e5')) if $self->priv < 5;
+		$full = 1;
+	} elsif ($f =~ /^\d+$/o) {
+		$ref = DXMsg::get($f);
+		if (!$ref) {
+			push @out, "Msg $f not found";
+			next;
+		}
+		if ($self->priv < 5 && $ref->to ne $call && $ref->from ne $call) {
+			push @out, "Msg $f not available";
+			next;
+		} 
+		push @refs, $ref;
+	} elsif ($f =~ /(\d+)-(\d+)/) {
+		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;
+	} elsif ($f =~ /^fr/io) {
+		$f = shift @f;
+		if ($f) {
+			$f = shellregex($f);
+			@refs = grep { !($self->priv < 5 && $_->to ne $call && $_->from ne $call) } DXMsg::get_all() unless @refs;
+			@refs = grep { $_->from =~ m{$f}i } @refs;
+		}
+	} elsif ($f =~ /^to/io) {
+		$f = shift @f;
+		if ($f) {
+			$f = shellregex($f);
+			@refs = grep { !($self->priv < 5 && $_->to ne $call && $_->from ne $call) } DXMsg::get_all() unless @refs;
+			@refs = grep { $_->to =~ m{$f}i } @refs;
+		}
+	} else {
+		push @out, "invalid argument '$f'";
+		return (1, @out);
+	}
+}
+
+foreach $ref ( @refs) {
+	Log('msg', "Message $ref->{msgno} from $ref->{from} to $ref->{to} deleted by $call");
+	if ($full) {
+		DXChannel::broadcast_nodes(DXProt::pc49($ref->{from}, $ref->{subject}), $main::me);
+	}
+	my $tonode = $ref->tonode;
+	$ref->stop_msg($tonode) if $tonode;
+	$ref->del_msg($self);
+	push @out, $self->msg('m12', $ref->msgno);
 }
 
 return (1, @out);