X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fsend.pl;h=ade1dce0aca7e3789e8f3d1daf4eb88ba7addb92;hb=f0ac8322367c66080b6dbb74da4de72dae126dc3;hp=9717c3afa3e4b578cc8bbde8858f17cb28edf812;hpb=79940e262f4585376cfed8bcdbaaff57c6b98eae;p=spider.git

diff --git a/cmd/send.pl b/cmd/send.pl
index 9717c3af..ade1dce0 100644
--- a/cmd/send.pl
+++ b/cmd/send.pl
@@ -68,8 +68,8 @@ if ($self->state eq "prompt") {
 			push @list, $oref->read_msg_body();
 			$nref->store(\@list);
 			$nref->add_dir();
-			#push @out, $self->msg('sendcc', $oref->msgno, $f[$i]);
-			push @out, "copy of msg $oref->{msgno} sent to $to";
+			push @out, $self->msg('m2', $oref->msgno, $to);
+#			push @out, "copy of msg $oref->{msgno} sent to $to";
 		}
 		DXMsg::queue_msg();
 		return (1, @out);
@@ -102,15 +102,30 @@ if ($self->state eq "prompt") {
 	}
   
 	# now save all the 'to' callsigns for later
-	my @to = map {uc $_} @f[ $i..$#f ];
-	$loc->{to} = \@to;
+	# first check the 'to' addresses for 'badness'
+    my $t;
+	my @to;
+	foreach  $t (@f[ $i..$#f ]) {
+		$t = uc $t;
+		if (grep $_ eq $t, @DXMsg::badmsg) {
+#			push @out, "Sorry, $t is an unacceptable TO address";
+			push @out, $self->msg('m3', $t);
+		} else {
+			push @to, $t;
+		}
+	}
+	if (@to) {
+		$loc->{to} = \@to;
+	} else {
+		return (1, @out);
+	}
 
 	# find me and set the state and the function on my state variable to
 	# keep calling me for every line until I relinquish control
 	$self->func("DXMsg::do_send_stuff");
 	$self->state('send1');
-	#push @out, $self->msg('sendsubj');
-	push @out, "Enter Subject (30 characters) >";
+	push @out, $self->msg('m1');
+	#push @out, "Enter Subject (30 characters) >";
 }
 
 return (1, @out);