define $use_admin_command_mail_fucntion ("no" by default).

3 files changed, 20 insertions, 1 deletions

diff --git a/fml/etc/src/config.cf.en/command.cf b/fml/etc/src/config.cf.en/command.cf
index 0572bb71..124732e7 100644
--- a/fml/etc/src/config.cf.en/command.cf
+++ b/fml/etc/src/config.cf.en/command.cf
@@ -11,6 +11,13 @@
 use_command_mail_function = ${use_command_mail_program:-yes}
 
 
+# Descriptions: use admin command mail ?
+#      History: $REMOTE_ADMINISTRATION
+#        Value: YES_OR_NO
+#     Examples: yes / no
+use_admin_command_mail_fucntion = no
+
+
 # Descriptions: add self introduction into the preamble of command mail reply. 
 #      History: none
 #        Value: YES_OR_NO
diff --git a/fml/etc/src/config.cf.ja/command.cf b/fml/etc/src/config.cf.ja/command.cf
index cca77c34..1eee4d05 100644
--- a/fml/etc/src/config.cf.ja/command.cf
+++ b/fml/etc/src/config.cf.ja/command.cf
@@ -11,6 +11,13 @@
 use_command_mail_function = ${use_command_mail_program:-yes}
 
 
+# Descriptions: admin コマンドメールを使うか？
+#      History: $REMOTE_ADMINISTRATION
+#        Value: YES_OR_NO
+#     Examples: yes / no
+use_admin_command_mail_fucntion = no
+
+
 # Descriptions: コマンドメールの返事の先頭に
 #		「こちらは fml8 です…」と自己紹介するか否か？
 #      History: none
diff --git a/fml/lib/FML/Command/User/admin.pm b/fml/lib/FML/Command/User/admin.pm
index a5e16170..066160fe 100644
--- a/fml/lib/FML/Command/User/admin.pm
+++ b/fml/lib/FML/Command/User/admin.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: admin.pm,v 1.17 2006/03/05 08:08:37 fukachan Exp $
+# $FML: admin.pm,v 1.18 2006/03/05 09:41:48 fukachan Exp $
 #
 
 package FML::Command::User::admin;
@@ -222,6 +222,11 @@ sub _apply_new_admin_command_mail_restrictions
     my $config  = $curproc->config();
     my $sender  = $opt_args->{ address } || '';
 
+    unless ($config->yes('use_admin_command_mail_fucntion')) {
+	$curproc->logerror("admin command prohibited.");
+	return 0;
+    }
+
     # initialize admin command specific area to pass it to sub layer.
     $curproc->command_context_set_try_admin_auth_request();
     $context->set_admin_options( $opt_args || {} );