define $post_restrictions_reject_notice_data_type.

enable choice of ways how to notify rejection as string or multipart in
denial of post?

3 files changed, 51 insertions, 14 deletions

diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 1b1fc980..59db0cdf 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -862,6 +862,17 @@ use_distribute_program	=	yes
 article_sequence_file	= $sequence_file
 
 
+=head2 ACL
+
+
+# Descriptions: 弾いたメールをどのようにフォワードするか？
+#               ウィルスなどを考慮すると、文字列がいいとおもう
+#      History: 4.0 では文字列で、これはハードコーディングされていた。
+#        Value: multipart / string
+#     Examples: string
+post_restrictions_reject_notice_data_type	=	string
+
+
 =head2	フィルタ
 
 
diff --git a/fml/etc/src/config.cf.ja/article.cf b/fml/etc/src/config.cf.ja/article.cf
index 0f929686..1008e011 100644
--- a/fml/etc/src/config.cf.ja/article.cf
+++ b/fml/etc/src/config.cf.ja/article.cf
@@ -10,6 +10,17 @@
 article_sequence_file	= $sequence_file
 
 
+=head2 ACL
+
+
+# Descriptions: 弾いたメールをどのようにフォワードするか？
+#               ウィルスなどを考慮すると、文字列がいいとおもう
+#      History: 4.0 では文字列で、これはハードコーディングされていた。
+#        Value: multipart / string
+#     Examples: string
+post_restrictions_reject_notice_data_type	=	string
+
+
 =head2	フィルタ
 
 
diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm
index ec876b6e..a388f1ab 100644
--- a/fml/lib/FML/Process/Distribute.pm
+++ b/fml/lib/FML/Process/Distribute.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2000,2001,2002,2003 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Distribute.pm,v 1.111 2003/03/17 09:01:17 fukachan Exp $
+# $FML: Distribute.pm,v 1.112 2003/03/18 10:42:45 fukachan Exp $
 #
 
 package FML::Process::Distribute;
@@ -197,6 +197,13 @@ sub run
     my $config     = $curproc->{ config };
     my $maintainer = $config->{ maintainer };
     my $sender     = $curproc->{'credential'}->{'sender'};
+    my $data_type  = 
+	$config->{post_restrictions_reject_notice_data_type} || 'string';
+    my $msg_args = {
+	_arg_address => $sender,
+	_arg_sender  => $sender,
+	recipient    => $sender,
+    };
 
     my $eval = $config->get_hook( 'distribute_run_start_hook' );
     if ($eval) { eval qq{ $eval; }; LogWarn($@) if $@; }
@@ -214,36 +221,44 @@ sub run
 	    my $rule = $pcb->get("check_restrictions", "deny_reason");
 	    if ($rule eq 'reject_system_accounts') {
 		my $r = "deny request from a system account";
-		$curproc->reply_message_nl("error.system_accounts", $r);
+		$curproc->reply_message_nl("error.system_accounts", 
+					   $r, $msg_args);
 	    }
 	    elsif ($rule eq 'permit_member_maps') {
 		my $r = "deny request from a not member";
-		$curproc->reply_message_nl("error.not_member", $r);
+		$curproc->reply_message_nl("error.not_member", $r, $msg_args);
 	    }
 	    elsif ($rule eq 'reject') {
 		my $r = "deny your request";
-		$curproc->reply_message_nl("error.reject_post", $r);
+		$curproc->reply_message_nl("error.reject_post", $r, $msg_args);
 	    }
 	    else {
 		my $r = "deny your request due to an unknown reason";
-		$curproc->reply_message_nl("error.reject_post", $r);
+		$curproc->reply_message_nl("error.reject_post", $r, $msg_args);
 	    }
 
+	    # send back deny request with the original message.
 	    my $msg = $curproc->incoming_message();
-	    $curproc->reply_message( $msg );
+	    if ($data_type eq 'string') {
+		my $s = $msg->whole_message_as_str( { indent => '   ' } );
+		$curproc->reply_message(sprintf("\n\n%s", $s), $msg_args);
+	    }
+	    else {
+		$curproc->reply_message( $msg, $msg_args );
+	    }
 
 	    # inform maintainer too.
-	    my $msg_args = {
-		_arg_address => $sender,
-		recipient    => $maintainer,
-	    };
+	    $msg_args->{ recipient } = $maintainer;
 	    $curproc->reply_message_nl("error.post_from_not_member",
 				       "post from not a member",
 				       $msg_args);
-	    $curproc->reply_message( $msg, $msg_args );
-
-	    # add header info.
-	    $curproc->reply_message_add_header_info();
+	    if ($data_type eq 'string') {
+		my $s = $msg->whole_message_as_str( { indent => '   ' } );
+		$curproc->reply_message(sprintf("\n\n%s", $s), $msg_args );
+	    }
+	    else {
+		$curproc->reply_message( $msg, $msg_args );
+	    }
 	}
     }
     else {