X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fsend.pl;h=b728d38791fd886ea6acdad5754141019bcbb96e;hb=af871033ca5f1548d108bde071b268e3e01b8f73;hp=9154d34b6f8966edb3fd4760106abf54966ede4c;hpb=6e8ea6c3fb2e0702e616a6553629905ca6ae22c1;p=spider.git

diff --git a/cmd/send.pl b/cmd/send.pl
index 9154d34b..b728d387 100644
--- a/cmd/send.pl
+++ b/cmd/send.pl
@@ -32,11 +32,13 @@ $loc->{rrreq} = '0';
 
 if ($self->state eq "prompt") {
 
-	my @f = split /([\s\@\$])/, $line;
+	my @f = split /([\s\@\$,])/, $line;
 	@f = map {s/\s+//g; length $_ ? $_ : ()} @f;
+	@f = grep {$_ ne ','} @f;
 	
 	# any thing after send?
 	return (1, $self->msg('e6')) if !@f;
+	return (1, $self->msg('e28')) unless $self->registered || uc $f[0] eq $main::myalias;
 
 	while (@f) {
 		my $f = uc shift @f; 
@@ -108,6 +110,8 @@ if ($self->state eq "prompt") {
 			# callsign ?
 			$notincalls = 0;
 
+#			$DB::single = 1;
+			
 			# is this callsign a distro?
 			my $fn = "/spider/msg/distro/$f.pl";
 			if (-e $fn) {
@@ -126,10 +130,14 @@ if ($self->state eq "prompt") {
 				}
 			}
 
-			if (grep $_ eq $f, @DXMsg::badmsg) {
-				push @out, $self->msg('m3', $f);
+			if (($loc->{private} && is_callsign($f)) || (!$loc->{private} && DXMsg::valid_bull_addr($f))) {
+				if (grep $_ eq $f, @DXMsg::badmsg) {
+					push @out, $self->msg('m3', $f);
+				} else {
+					push @to, $f;
+				}
 			} else {
-				push @to, $f;
+				push @out, $self->msg('m3', $f);
 			}
 		}
 	}
@@ -139,7 +147,7 @@ if ($self->state eq "prompt") {
 		$loc->{to} = \@to;
 	} else {
 		delete $self->{loc};
-		return (1, $self->msg('e6'));
+		return (1, @out, $self->msg('e6'));
 	}
 	$loc->{from} ||= $self->call;
 	unless (is_callsign($loc->{from})) {