regen: *_total_limit

6 files changed, 156 insertions, 1 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index 4470e5ec..fa980844 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -625,6 +625,11 @@ member {
           $member_maps
           $primary_member_map
    }
+
+   member_total_limit { 
+          $member_total_limit
+          $use_member_total_limit
+   }
 }
 
 message {
@@ -781,6 +786,11 @@ recipient {
           $recipient_maps
           $smtp_recipient_limit
    }
+
+   recipient_total_limit { 
+          $recipient_total_limit
+          $use_recipient_total_limit
+   }
 }
 
 reply_message {
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index 32bd826a..93d9aa57 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -1621,6 +1621,15 @@ $primary_member_map
 </row>
 <row>
 <entry>
+member_total_limit</entry>
+<entry>
+ upper limit of posters.</entry>
+<entry>
+3000
+   </entry>
+</row>
+<row>
+<entry>
 message_id_cache_dir</entry>
 <entry>
  Message-ID cache directory</entry>
@@ -2024,6 +2033,15 @@ $primary_recipient_map
 </row>
 <row>
 <entry>
+recipient_total_limit</entry>
+<entry>
+ upper limit of recipients.</entry>
+<entry>
+3000
+   </entry>
+</row>
+<row>
+<entry>
 sendmail_virtual_map_file</entry>
 <entry>
  sample of /etc/mail/virtusertable</entry>
@@ -2666,6 +2684,15 @@ no
 </row>
 <row>
 <entry>
+use_member_total_limit</entry>
+<entry>
+ upper limit of posters. no limitation by default.</entry>
+<entry>
+no
+   </entry>
+</row>
+<row>
+<entry>
 use_moderate_function</entry>
 <entry>
  use moderate function or not.</entry>
@@ -2684,6 +2711,15 @@ yes
 </row>
 <row>
 <entry>
+use_recipient_total_limit</entry>
+<entry>
+ upper limit of recipients. no limitation by default.</entry>
+<entry>
+no
+   </entry>
+</row>
+<row>
+<entry>
 use_smtp_log</entry>
 <entry>
  log smtp transaction ?</entry>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index 4470e5ec..fa980844 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -625,6 +625,11 @@ member {
           $member_maps
           $primary_member_map
    }
+
+   member_total_limit { 
+          $member_total_limit
+          $use_member_total_limit
+   }
 }
 
 message {
@@ -781,6 +786,11 @@ recipient {
           $recipient_maps
           $smtp_recipient_limit
    }
+
+   recipient_total_limit { 
+          $recipient_total_limit
+          $use_recipient_total_limit
+   }
 }
 
 reply_message {
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 5fd145df..da589cb7 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -1613,6 +1613,15 @@ $primary_member_map
 </row>
 <row>
 <entry>
+member_total_limit</entry>
+<entry>
+ ユーザ数(正確には投稿可能数)の上限</entry>
+<entry>
+3000
+   </entry>
+</row>
+<row>
+<entry>
 message_id_cache_dir</entry>
 <entry>
  すべての Message-ID のキャッシュを格納するディレクトリ</entry>
@@ -2016,6 +2025,15 @@ $primary_recipient_map
 </row>
 <row>
 <entry>
+recipient_total_limit</entry>
+<entry>
+ ユーザ数(正確には受信者数)の上限</entry>
+<entry>
+3000
+   </entry>
+</row>
+<row>
+<entry>
 sendmail_virtual_map_file</entry>
 <entry>
  MTA に教えるための virtual map ファイル</entry>
@@ -2696,6 +2714,15 @@ no
 </row>
 <row>
 <entry>
+use_member_total_limit</entry>
+<entry>
+ ユーザ数(正確には投稿可能数)の上限を設けるか？</entry>
+<entry>
+no
+   </entry>
+</row>
+<row>
+<entry>
 use_moderate_function</entry>
 <entry>
  use moderate function or not.</entry>
@@ -2714,6 +2741,15 @@ yes
 </row>
 <row>
 <entry>
+use_recipient_total_limit</entry>
+<entry>
+ ユーザ数(正確には受信者数)の上限を設けるか？</entry>
+<entry>
+no
+   </entry>
+</row>
+<row>
+<entry>
 use_smtp_log</entry>
 <entry>
  SMTP の様子をログにとるか？</entry>
diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 66c94a38..e3bb56a4 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -617,6 +617,37 @@ article_post_address	=	$address_for_post
 #     Examples:
 command_mail_address	=	$address_for_command
 
+=head1	limitation for number of users
+
+
+# Descriptions: upper limit of recipients. no limitation by default.
+#      History: $MAX_MEMBER_LIMIT
+#        Value: YES_OR_NO
+#     Examples: no
+use_recipient_total_limit	=	no
+
+
+# Descriptions: upper limit of recipients.
+#      History: $MAX_MEMBER_LIMIT
+#        Value: NUM
+#     Examples: 3000
+recipient_total_limit		=	3000
+
+
+# Descriptions: upper limit of posters. no limitation by default.
+#      History: $MAX_MEMBER_LIMIT
+#        Value: YES_OR_NO
+#     Examples: no
+use_member_total_limit		=	no
+
+
+# Descriptions: upper limit of posters.
+#      History: $MAX_MEMBER_LIMIT
+#        Value: NUM
+#     Examples: 3000
+member_total_limit		=	3000
+
+
 =head1	User Information
 
 # Descriptions: user database directory.
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 179311f5..7581e5a6 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -628,8 +628,40 @@ command_mail_address	=	$address_for_command
 
 
 
-=head1	ユーザ情報
+=head1	ユーザ数制限
+
+
+# Descriptions: ユーザ数(正確には受信者数)の上限を設けるか？
+#		デフォルトは設けない
+#      History: $MAX_MEMBER_LIMIT
+#        Value: YES_OR_NO
+#     Examples: no
+use_recipient_total_limit	=	no
+
+
+# Descriptions: ユーザ数(正確には受信者数)の上限
+#      History: $MAX_MEMBER_LIMIT
+#        Value: NUM
+#     Examples: 3000
+recipient_total_limit		=	3000
+
 
+# Descriptions: ユーザ数(正確には投稿可能数)の上限を設けるか？
+#		デフォルトは設けない
+#      History: $MAX_MEMBER_LIMIT
+#        Value: YES_OR_NO
+#     Examples: no
+use_member_total_limit		=	no
+
+
+# Descriptions: ユーザ数(正確には投稿可能数)の上限
+#      History: $MAX_MEMBER_LIMIT
+#        Value: NUM
+#     Examples: 3000
+member_total_limit		=	3000
+
+
+=head1	ユーザ情報
 
 =head2	データベース