X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdirectory.pl;h=1e2193219ef984afc97bde2cc1e0dfbba04f5563;hb=refs%2Fheads%2Fip_address;hp=f5d1566d12cb4d53bba749474fc4600087573622;hpb=af2f3a0a2f8e5d99e0072c194f20a1da2f559348;p=spider.git

diff --git a/cmd/directory.pl b/cmd/directory.pl
index f5d1566d..1e219321 100644
--- a/cmd/directory.pl
+++ b/cmd/directory.pl
@@ -3,7 +3,7 @@
 #
 # Copyright (c) Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -13,7 +13,12 @@ my $ref;
 my @out;
 my $f;
 my $n = 0;
-my @all = grep {!($self->priv < 5 && $_->private && $_->to ne $self->call && $_->from ne $self->call)} (DXMsg::get_all());
+
+# select candidates
+my @all = grep {!$_->private || !($self->priv < 5 && $_->to ne $self->call && $_->from ne $self->call)} (DXMsg::get_all());
+@all =  grep {!$_->delete  || ($self->priv >= 5 && $_->delete)} @all;
+
+return (1, $self->msg('dir1')) unless @all;
 my $sel = 0;
 my $from = 0;
 my $to = $all[@all-1]->msgno;
@@ -75,6 +80,6 @@ if (@ref) {
 		last if ++$count >= $n;
 	}
 } else {
-	push @out, $self->msg('e3', 'directory', $line); 
+	push @out, $self->msg('dir1'); 
 }
 return (1, @out);