cgi_menu_map_list -> cgi_menu_address_map_list

cgi_menu_default_map -> cgi_menu_default_address_map

6 files changed, 13 insertions, 13 deletions

diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 299b6633..e595dc3b 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -1797,7 +1797,7 @@ cgi_navigation_bar_color	=	#FFFFFF
 #      History: 
 #        Value: member recipient admin_member
 #     Examples: member recipient admin_member
-cgi_menu_map_list		=	member
+cgi_menu_address_map_list		=	member
 					recipient
 					admin_member
 
@@ -1806,7 +1806,7 @@ cgi_menu_map_list		=	member
 #      History: 
 #        Value: member recipient admin_member
 #     Examples: member
-cgi_menu_default_map		=	member
+cgi_menu_default_address_map		=	member
 
 =head1 MTA related configurations
 
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index dc31e4da..058ec2c3 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -1862,7 +1862,7 @@ cgi_navigation_bar_color	=	#FFFFFF
 #      History: 4.0 には該当する変数はない
 #        Value: member recipient admin_member
 #     Examples: member recipient admin_member
-cgi_menu_map_list		=	member
+cgi_menu_address_map_list		=	member
 					recipient
 					admin_member
 
@@ -1871,7 +1871,7 @@ cgi_menu_map_list		=	member
 #      History: 4.0 には該当する変数はない
 #        Value: member recipient admin_member
 #     Examples: member
-cgi_menu_default_map		=	member
+cgi_menu_default_address_map		=	member
 
 =head1	MTA に依存する設定のヒント
 
diff --git a/fml/etc/src/config.cf.en/cgi.cf b/fml/etc/src/config.cf.en/cgi.cf
index 97199d0c..3e3e816f 100644
--- a/fml/etc/src/config.cf.en/cgi.cf
+++ b/fml/etc/src/config.cf.en/cgi.cf
@@ -73,7 +73,7 @@ cgi_navigation_bar_color	=	#FFFFFF
 #      History: 
 #        Value: member recipient admin_member
 #     Examples: member recipient admin_member
-cgi_menu_map_list		=	member
+cgi_menu_address_map_list		=	member
 					recipient
 					admin_member
 
@@ -82,4 +82,4 @@ cgi_menu_map_list		=	member
 #      History: 
 #        Value: member recipient admin_member
 #     Examples: member
-cgi_menu_default_map		=	member
+cgi_menu_default_address_map		=	member
diff --git a/fml/etc/src/config.cf.ja/cgi.cf b/fml/etc/src/config.cf.ja/cgi.cf
index 7b53151c..2dc0a380 100644
--- a/fml/etc/src/config.cf.ja/cgi.cf
+++ b/fml/etc/src/config.cf.ja/cgi.cf
@@ -79,7 +79,7 @@ cgi_navigation_bar_color	=	#FFFFFF
 #      History: 4.0 には該当する変数はない
 #        Value: member recipient admin_member
 #     Examples: member recipient admin_member
-cgi_menu_map_list		=	member
+cgi_menu_address_map_list		=	member
 					recipient
 					admin_member
 
@@ -88,4 +88,4 @@ cgi_menu_map_list		=	member
 #      History: 4.0 には該当する変数はない
 #        Value: member recipient admin_member
 #     Examples: member
-cgi_menu_default_map		=	member
+cgi_menu_default_address_map		=	member
diff --git a/fml/lib/FML/CGI/List.pm b/fml/lib/FML/CGI/List.pm
index 3a92b06d..099871f4 100644
--- a/fml/lib/FML/CGI/List.pm
+++ b/fml/lib/FML/CGI/List.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: List.pm,v 1.5 2003/09/27 06:58:16 fukachan Exp $
+# $FML: List.pm,v 1.6 2003/10/14 10:55:27 fukachan Exp $
 #
 
 package FML::CGI::List;
@@ -51,7 +51,7 @@ sub cgi_menu
     }
 
     # check $map_default included in $map_list.
-    unless ($config->has_attribute("cgi_menu_map_list", $map_default)) {
+    unless ($config->has_attribute("cgi_menu_address_map_list", $map_default)) {
 	croak("invalid map: $map_default");
     }
 
diff --git a/fml/lib/FML/Process/CGI/Utils.pm b/fml/lib/FML/Process/CGI/Utils.pm
index 87e520af..3dc42106 100644
--- a/fml/lib/FML/Process/CGI/Utils.pm
+++ b/fml/lib/FML/Process/CGI/Utils.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: Utils.pm,v 1.6 2003/10/15 10:12:13 fukachan Exp $
+# $FML: Utils.pm,v 1.7 2003/10/16 14:06:57 fukachan Exp $
 #
 
 package FML::Process::CGI::Utils;
@@ -99,7 +99,7 @@ sub cgi_var_address_map
 {
     my ($curproc)   = @_;
     my $config      = $curproc->config();
-    my $_defaultmap = $config->{ cgi_menu_default_map };
+    my $_defaultmap = $config->{ cgi_menu_default_address_map };
 
     return $curproc->safe_param_map() || $_defaultmap;
 }
@@ -113,7 +113,7 @@ sub cgi_var_address_map_list
 {
     my ($curproc) = @_;
     my $config    = $curproc->config();
-    return $config->get_as_array_ref('cgi_menu_map_list');
+    return $config->get_as_array_ref('cgi_menu_address_map_list');
 }