diff options
| author | fukachan <fukachan> | 2003-08-29 15:33:54 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2003-08-29 15:33:54 +0000 |
| commit | e460ae393d4c06ac2219811653b1388acf28bebb (patch) | |
| tree | 5c04b53bb40f2e2e749db3be89dd9db9920830bb /fml/lib | |
| parent | 69b67704253d230af64d85a6b8b91ed4b9bac14d (diff) | |
| download | fml8-e460ae393d4c06ac2219811653b1388acf28bebb.tar.gz fml8-e460ae393d4c06ac2219811653b1388acf28bebb.tar.bz2 fml8-e460ae393d4c06ac2219811653b1388acf28bebb.zip | |
use $curproc->config(), pcb() not { config }, { pcb } respectively.
Diffstat (limited to 'fml/lib')
60 files changed, 250 insertions, 250 deletions
diff --git a/fml/lib/FML/CGI/Admin/ML.pm b/fml/lib/FML/CGI/Admin/ML.pm index 9f2c8d20..a2805b0c 100644 --- a/fml/lib/FML/CGI/Admin/ML.pm +++ b/fml/lib/FML/CGI/Admin/ML.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: ML.pm,v 1.7 2002/12/18 04:50:31 fukachan Exp $ +# $FML: ML.pm,v 1.8 2003/02/15 02:54:25 fukachan Exp $ # package FML::CGI::Admin::ML; @@ -37,7 +37,7 @@ sub new sub cgi_menu { my ($self, $curproc, $args, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $action = $curproc->safe_cgi_action_name(); my $ml_domain = $curproc->ml_domain(); my $ml_list = $curproc->get_ml_list($args, $ml_domain); diff --git a/fml/lib/FML/CGI/Admin/Menu.pm b/fml/lib/FML/CGI/Admin/Menu.pm index 51af5075..d1ef5882 100644 --- a/fml/lib/FML/CGI/Admin/Menu.pm +++ b/fml/lib/FML/CGI/Admin/Menu.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: Menu.pm,v 1.24 2003/02/15 02:54:25 fukachan Exp $ +# $FML: Menu.pm,v 1.25 2003/02/16 08:33:08 fukachan Exp $ # package FML::CGI::Admin::Menu; @@ -72,7 +72,7 @@ This module has routines needed for the admin CGI. sub html_start { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $myname = $curproc->myname(); my $domain = $curproc->ml_domain(); # must be safe (hard-coded in .cgi) my $ml_name = $curproc->cgi_try_get_ml_name($args); # safe ok @@ -111,11 +111,11 @@ sub html_end sub run_cgi_main { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $address = $curproc->cgi_try_get_address($args); my $ml_name = $curproc->cgi_try_get_ml_name($args); my $hints = $curproc->hints(); - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); my $mode = 'admin'; # cgi runs under admin mode (same way as makefml) # specified command, we need to identify @@ -213,7 +213,7 @@ sub run_cgi_main sub run_cgi_navigator { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $action = $curproc->safe_cgi_action_name(); my $target = '_top'; diff --git a/fml/lib/FML/CGI/Admin/User.pm b/fml/lib/FML/CGI/Admin/User.pm index a58eaa2d..043cd82e 100644 --- a/fml/lib/FML/CGI/Admin/User.pm +++ b/fml/lib/FML/CGI/Admin/User.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: User.pm,v 1.16 2003/02/15 02:54:25 fukachan Exp $ +# $FML: User.pm,v 1.17 2003/05/15 03:26:03 fukachan Exp $ # package FML::CGI::Admin::User; @@ -42,7 +42,7 @@ sub cgi_menu my $target = '_top'; my $ml_list = $curproc->get_ml_list($args); my $address = $curproc->safe_param_address() || ''; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_name = $command_args->{ ml_name }; my $comname = $command_args->{ comname }; my $address_list = []; diff --git a/fml/lib/FML/CGI/Calendar.pm b/fml/lib/FML/CGI/Calendar.pm index 0a2dd092..b23c9887 100644 --- a/fml/lib/FML/CGI/Calendar.pm +++ b/fml/lib/FML/CGI/Calendar.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: Calendar.pm,v 1.2 2003/01/31 14:56:14 fukachan Exp $ +# $FML: Calendar.pm,v 1.3 2003/02/16 08:33:07 fukachan Exp $ # package FML::CGI::Calendar; @@ -53,7 +53,7 @@ Almost all methods inherit C<FML::Process::CGI> base class. sub html_start { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $user = $curproc->safe_param_user; my $myname = $curproc->myname(); my $title = "$user schedule"; diff --git a/fml/lib/FML/CGI/ThreadTrack.pm b/fml/lib/FML/CGI/ThreadTrack.pm index 479acbe4..b0d21200 100644 --- a/fml/lib/FML/CGI/ThreadTrack.pm +++ b/fml/lib/FML/CGI/ThreadTrack.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: ThreadTrack.pm,v 1.24 2003/02/16 08:33:08 fukachan Exp $ +# $FML: ThreadTrack.pm,v 1.25 2003/03/28 10:03:38 fukachan Exp $ # package FML::CGI::ThreadTrack; @@ -54,7 +54,7 @@ C<FML::Process::CGI> base class. sub html_start { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $title = $config->{ thread_cgi_title } || 'thread system interface'; my $color = $config->{ thread_cgi_bgcolor } || '#E6E6FA'; my $myname = $curproc->myname(); @@ -90,7 +90,7 @@ sub html_end sub run_cgi_main { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $myname = $config->{ program_name }; # XXX-TODO: valid ? my $ttargs = $curproc->_build_threadtrack_param($args); my $action = $curproc->safe_param_action() || ''; @@ -147,7 +147,7 @@ sub run_cgi_main sub _build_threadtrack_param { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $myname = $config->{ program_name }; my $option = $curproc->command_line_options(); @@ -188,7 +188,7 @@ sub _build_threadtrack_param sub run_cgi_navigator { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $action = $curproc->safe_cgi_action_name(); my $target = $config->{ thread_cgi_target_window } || '_top'; # XXX-TODO: we should provide $curproc->util->get_ml_list() method ? diff --git a/fml/lib/FML/Command/Admin/addadmin.pm b/fml/lib/FML/Command/Admin/addadmin.pm index f0b2744a..ece2be51 100644 --- a/fml/lib/FML/Command/Admin/addadmin.pm +++ b/fml/lib/FML/Command/Admin/addadmin.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: addadmin.pm,v 1.10 2003/03/18 10:42:41 fukachan Exp $ +# $FML: addadmin.pm,v 1.11 2003/08/23 04:35:29 fukachan Exp $ # package FML::Command::Admin::addadmin; @@ -66,7 +66,7 @@ sub lock_channel { return 'command_serialize';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $member_map = $config->{ primary_admin_member_map }; my $recipient_map = $config->{ primary_admin_recipient_map }; my $options = $command_args->{ options }; diff --git a/fml/lib/FML/Command/Admin/addmoderator.pm b/fml/lib/FML/Command/Admin/addmoderator.pm index a5f39f16..8c7fb273 100644 --- a/fml/lib/FML/Command/Admin/addmoderator.pm +++ b/fml/lib/FML/Command/Admin/addmoderator.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: addmoderator.pm,v 1.5 2003/03/18 10:42:42 fukachan Exp $ +# $FML: addmoderator.pm,v 1.6 2003/08/23 04:35:29 fukachan Exp $ # package FML::Command::Admin::addmoderator; @@ -66,7 +66,7 @@ sub lock_channel { return 'command_serialize';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $member_map = $config->{ primary_moderator_member_map }; my $recipient_map = $config->{ primary_moderator_recipient_map }; my $options = $command_args->{ options }; diff --git a/fml/lib/FML/Command/Admin/chaddr.pm b/fml/lib/FML/Command/Admin/chaddr.pm index 50306b64..791aa249 100644 --- a/fml/lib/FML/Command/Admin/chaddr.pm +++ b/fml/lib/FML/Command/Admin/chaddr.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: chaddr.pm,v 1.17 2003/08/23 04:35:30 fukachan Exp $ +# $FML: chaddr.pm,v 1.18 2003/08/23 07:24:43 fukachan Exp $ # package FML::Command::Admin::chaddr; @@ -69,7 +69,7 @@ sub lock_channel { return 'command_serialize';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $member_map = $config->{ 'primary_member_map' }; my $recipient_map = $config->{ 'primary_recipient_map' }; my $options = $command_args->{ options }; diff --git a/fml/lib/FML/Command/Admin/check.pm b/fml/lib/FML/Command/Admin/check.pm index 276c32a1..d75a8dd2 100644 --- a/fml/lib/FML/Command/Admin/check.pm +++ b/fml/lib/FML/Command/Admin/check.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: check.pm,v 1.7 2003/02/13 14:40:43 fukachan Exp $ +# $FML: check.pm,v 1.8 2003/02/14 15:29:02 fukachan Exp $ # package FML::Command::Admin::check; @@ -83,7 +83,7 @@ sub process sub check_spool_dir { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $spool_dir = $config->{ spool_dir }; # @@ -116,7 +116,7 @@ sub check_spool_dir sub check_html_archive_dir { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $html_dir = $config->{ html_archive_dir }; print "html_archive_dir ... "; diff --git a/fml/lib/FML/Command/Admin/dir.pm b/fml/lib/FML/Command/Admin/dir.pm index 1405ef0b..79694d00 100644 --- a/fml/lib/FML/Command/Admin/dir.pm +++ b/fml/lib/FML/Command/Admin/dir.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: dir.pm,v 1.11 2003/01/25 12:48:38 fukachan Exp $ +# $FML: dir.pm,v 1.12 2003/08/23 04:35:30 fukachan Exp $ # package FML::Command::Admin::dir; @@ -59,7 +59,7 @@ sub need_lock { 0;} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $log_file = $config->{ log_file }; my $options = $command_args->{ options }; my $du_args = {}; diff --git a/fml/lib/FML/Command/Admin/file.pm b/fml/lib/FML/Command/Admin/file.pm index d1acb6af..82812d83 100644 --- a/fml/lib/FML/Command/Admin/file.pm +++ b/fml/lib/FML/Command/Admin/file.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: file.pm,v 1.12 2003/03/18 10:42:43 fukachan Exp $ +# $FML: file.pm,v 1.13 2003/08/23 04:35:31 fukachan Exp $ # package FML::Command::Admin::file; @@ -73,7 +73,7 @@ sub is_subcommand_style { 1;} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $log_file = $config->{ log_file }; my $options = $command_args->{ options }; my $du_args = {}; diff --git a/fml/lib/FML/Command/Admin/htmlify.pm b/fml/lib/FML/Command/Admin/htmlify.pm index 8303b100..6651c9e9 100644 --- a/fml/lib/FML/Command/Admin/htmlify.pm +++ b/fml/lib/FML/Command/Admin/htmlify.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: htmlify.pm,v 1.19 2002/09/24 14:23:13 fukachan Exp $ +# $FML: htmlify.pm,v 1.20 2002/12/20 03:40:12 fukachan Exp $ # package FML::Command::Admin::htmlify; @@ -57,7 +57,7 @@ sub process { my ($self, $curproc, $command_args) = @_; my $args = $command_args->{ args }; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $src_dir = $config->{ spool_dir }; my $dst_dir = $config->{ html_archive_dir }; my $debug = 0; diff --git a/fml/lib/FML/Command/Admin/list.pm b/fml/lib/FML/Command/Admin/list.pm index 1f22e838..da5a1983 100644 --- a/fml/lib/FML/Command/Admin/list.pm +++ b/fml/lib/FML/Command/Admin/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.13 2003/01/27 00:02:41 fukachan Exp $ +# $FML: list.pm,v 1.14 2003/08/23 07:24:43 fukachan Exp $ # package FML::Command::Admin::list; @@ -78,7 +78,7 @@ sub process sub _show_list { my ($self, $curproc, $command_args, $options) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $maplist = undef; for my $option (@$options) { diff --git a/fml/lib/FML/Command/Admin/log.pm b/fml/lib/FML/Command/Admin/log.pm index 8791607e..95381f8a 100644 --- a/fml/lib/FML/Command/Admin/log.pm +++ b/fml/lib/FML/Command/Admin/log.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: log.pm,v 1.15 2003/02/20 04:32:50 fukachan Exp $ +# $FML: log.pm,v 1.16 2003/08/23 04:35:31 fukachan Exp $ # package FML::Command::Admin::log; @@ -59,7 +59,7 @@ sub need_lock { 0;} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $log_file = $config->{ log_file }; my $options = $command_args->{ options }; my $address = $command_args->{ command_data } || $options->[ 0 ]; @@ -82,7 +82,7 @@ sub process sub cgi_menu { my ($self, $curproc, $args, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $log_file = $config->{ log_file }; my $style = $curproc->get_print_style(); diff --git a/fml/lib/FML/Command/Admin/newml.pm b/fml/lib/FML/Command/Admin/newml.pm index 1673857e..e1185d85 100644 --- a/fml/lib/FML/Command/Admin/newml.pm +++ b/fml/lib/FML/Command/Admin/newml.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: newml.pm,v 1.64 2003/04/19 06:13:00 fukachan Exp $ +# $FML: newml.pm,v 1.65 2003/08/23 04:35:31 fukachan Exp $ # package FML::Command::Admin::newml; @@ -227,7 +227,7 @@ sub _init_ml_home_dir sub _install_template_files { my ($self, $curproc, $command_args, $params) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $template_dir = $curproc->template_files_dir_for_newml(); my $ml_home_dir = $params->{ ml_home_dir }; my $templ_files = @@ -266,7 +266,7 @@ sub _install_template_files sub _update_aliases { my ($self, $curproc, $command_args, $params) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_name = $config->{ ml_name }; my $ml_domain = $config->{ ml_domain }; my $alias = $config->{ mail_aliases_file }; @@ -360,7 +360,7 @@ sub _is_mta_alias_maps_has_ml_entry sub _setup_mail_archive_dir { my ($self, $curproc, $command_args, $params) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $dir = $config->{ html_archive_dir }; unless (-d $dir) { @@ -382,7 +382,7 @@ sub _setup_cgi_interface { my ($self, $curproc, $command_args, $params) = @_; my $template_dir = $curproc->template_files_dir_for_newml(); - my $config = $curproc->{ config }; + my $config = $curproc->config(); # # 1. create directory path if needed @@ -480,7 +480,7 @@ sub _install sub _setup_listinfo { my ($self, $curproc, $command_args, $params) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $template_dir = $config->{ listinfo_template_dir }; my $listinfo_dir = $config->{ listinfo_dir }; diff --git a/fml/lib/FML/Command/Admin/on.pm b/fml/lib/FML/Command/Admin/on.pm index e69feeb2..e2d7d637 100644 --- a/fml/lib/FML/Command/Admin/on.pm +++ b/fml/lib/FML/Command/Admin/on.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: on.pm,v 1.9 2003/05/12 10:16:43 fukachan Exp $ +# $FML: on.pm,v 1.10 2003/08/23 04:35:31 fukachan Exp $ # package FML::Command::Admin::on; @@ -66,7 +66,7 @@ sub lock_channel { return 'command_serialize';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $recipient_map = $config->{ primary_recipient_map }; my $options = $command_args->{ options }; my $address = $command_args->{ command_data } || $options->[ 0 ]; diff --git a/fml/lib/FML/Command/Admin/rmml.pm b/fml/lib/FML/Command/Admin/rmml.pm index 874c9467..a9362755 100644 --- a/fml/lib/FML/Command/Admin/rmml.pm +++ b/fml/lib/FML/Command/Admin/rmml.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: rmml.pm,v 1.14 2003/01/25 12:48:39 fukachan Exp $ +# $FML: rmml.pm,v 1.15 2003/08/23 04:35:32 fukachan Exp $ # package FML::Command::Admin::rmml; @@ -141,7 +141,7 @@ sub _remove_ml_home_dir sub _remove_aliases { my ($self, $curproc, $command_args, $params) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_name = $params->{ ml_name }; my $list = $config->get_as_array_ref('newml_command_mta_config_list'); diff --git a/fml/lib/FML/Command/Admin/subscribe.pm b/fml/lib/FML/Command/Admin/subscribe.pm index 0d39f00c..badb60fa 100644 --- a/fml/lib/FML/Command/Admin/subscribe.pm +++ b/fml/lib/FML/Command/Admin/subscribe.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: subscribe.pm,v 1.22 2003/03/18 10:42:43 fukachan Exp $ +# $FML: subscribe.pm,v 1.23 2003/08/23 04:35:32 fukachan Exp $ # package FML::Command::Admin::subscribe; @@ -68,7 +68,7 @@ sub lock_channel { return 'command_serialize';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $member_map = $config->{ primary_member_map }; my $recipient_map = $config->{ primary_recipient_map }; my $options = $command_args->{ options }; diff --git a/fml/lib/FML/Command/Admin/summary.pm b/fml/lib/FML/Command/Admin/summary.pm index 8d049be7..9366553b 100644 --- a/fml/lib/FML/Command/Admin/summary.pm +++ b/fml/lib/FML/Command/Admin/summary.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: summary.pm,v 1.3 2003/03/28 10:03:38 fukachan Exp $ +# $FML: summary.pm,v 1.4 2003/08/23 04:35:32 fukachan Exp $ # package FML::Command::Admin::summary; @@ -78,7 +78,7 @@ sub process sub _summary { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $myname = $curproc->myname(); my $argv = $curproc->command_line_argv(); my $id_max = $curproc->article_max_id(); diff --git a/fml/lib/FML/Command/Admin/unsubscribe.pm b/fml/lib/FML/Command/Admin/unsubscribe.pm index 97e23e9a..867072f5 100644 --- a/fml/lib/FML/Command/Admin/unsubscribe.pm +++ b/fml/lib/FML/Command/Admin/unsubscribe.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: unsubscribe.pm,v 1.23 2003/05/12 10:16:43 fukachan Exp $ +# $FML: unsubscribe.pm,v 1.24 2003/08/23 04:35:32 fukachan Exp $ # package FML::Command::Admin::unsubscribe; @@ -68,7 +68,7 @@ sub lock_channel { return 'command_serialize';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $member_map = $config->{ 'primary_member_map' }; my $recipient_map = $config->{ 'primary_recipient_map' }; my $options = $command_args->{ options }; diff --git a/fml/lib/FML/Command/Auth.pm b/fml/lib/FML/Command/Auth.pm index 8392fdbf..125611f8 100644 --- a/fml/lib/FML/Command/Auth.pm +++ b/fml/lib/FML/Command/Auth.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: Auth.pm,v 1.26 2003/05/12 10:16:41 fukachan Exp $ +# $FML: Auth.pm,v 1.27 2003/08/23 07:24:41 fukachan Exp $ # package FML::Command::Auth; @@ -131,7 +131,7 @@ check the password if it is valid or not as an administrator. sub check_admin_member_password { my ($self, $curproc, $args, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $maplist = $config->get_as_array_ref('admin_member_password_maps'); my $status = 0; diff --git a/fml/lib/FML/Command/DataCheck.pm b/fml/lib/FML/Command/DataCheck.pm index ab2a2780..04a77e62 100644 --- a/fml/lib/FML/Command/DataCheck.pm +++ b/fml/lib/FML/Command/DataCheck.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: DataCheck.pm,v 1.8 2002/12/24 10:19:43 fukachan Exp $ +# $FML: DataCheck.pm,v 1.9 2002/12/25 03:11:04 fukachan Exp $ # package FML::Command::DataCheck; @@ -92,7 +92,7 @@ sub parse_command_arguments sub find_special_keyword { my ($self, $curproc, $ra_data) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $confirm_prefix = $config->{ confirm_command_prefix }; my $admin_prefix = $config->{ privileged_command_prefix }; my $confirm_found = ''; @@ -130,7 +130,7 @@ sub find_special_keyword sub find_commands_for_stranger { my ($self, $curproc) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $commands = $config->get_as_array_ref('commands_for_stranger'); my $body = $curproc->incoming_message_body(); my $msg = $body->find_first_plaintext_message(); diff --git a/fml/lib/FML/Command/DirUtils.pm b/fml/lib/FML/Command/DirUtils.pm index f1b00a77..5821efe0 100644 --- a/fml/lib/FML/Command/DirUtils.pm +++ b/fml/lib/FML/Command/DirUtils.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: DirUtils.pm,v 1.13 2003/01/26 03:11:27 fukachan Exp $ +# $FML: DirUtils.pm,v 1.14 2003/08/23 07:24:42 fukachan Exp $ # package FML::Command::DirUtils; @@ -57,7 +57,7 @@ sub new sub dir { my ($self, $curproc, $command_args, $du_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $path_ls = $config->{ path_ls }; my $argv = $du_args->{ argv }; my $opt_ls = ''; diff --git a/fml/lib/FML/Command/FileUtils.pm b/fml/lib/FML/Command/FileUtils.pm index b3aaa121..f788069f 100644 --- a/fml/lib/FML/Command/FileUtils.pm +++ b/fml/lib/FML/Command/FileUtils.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: FileUtils.pm,v 1.12 2003/02/09 12:31:41 fukachan Exp $ +# $FML: FileUtils.pm,v 1.13 2003/08/23 07:24:42 fukachan Exp $ # package FML::Command::FileUtils; @@ -80,7 +80,7 @@ sub delete sub remove { my ($self, $curproc, $command_args, $du_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $argv = $du_args->{ options }; my $is_error = 0; diff --git a/fml/lib/FML/Command/SendFile.pm b/fml/lib/FML/Command/SendFile.pm index 30631ab6..7d5aa553 100644 --- a/fml/lib/FML/Command/SendFile.pm +++ b/fml/lib/FML/Command/SendFile.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: SendFile.pm,v 1.29 2003/08/23 04:35:29 fukachan Exp $ +# $FML: SendFile.pm,v 1.30 2003/08/23 07:24:42 fukachan Exp $ # package FML::Command::SendFile; @@ -82,7 +82,7 @@ sub send_article { my ($self, $curproc, $command_args) = @_; my $command = $command_args->{ command }; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_name = $config->{ ml_name }; my $spool_dir = $config->{ spool_dir }; my $charset = $config->{ template_file_charset }; @@ -175,7 +175,7 @@ sub send_file my ($self, $curproc, $command_args) = @_; my $filename = $command_args->{ _filename_to_send }; my $filepath = $command_args->{ _filepath_to_send }; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # XXX-TODO: handle non Japanese. # XXX-TODO: care for Accept-Language: header field. @@ -224,7 +224,7 @@ Sebd back the default help message if not found. sub send_user_xxx_message { my ($self, $curproc, $command_args, $type) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # XXX-TODO: care for non Japanese # XXX-TODO: hmm, we can handle file.ja file.ja.euc file.en file.ru ? diff --git a/fml/lib/FML/Command/User/chaddr.pm b/fml/lib/FML/Command/User/chaddr.pm index 7a7c254b..dcf58f54 100644 --- a/fml/lib/FML/Command/User/chaddr.pm +++ b/fml/lib/FML/Command/User/chaddr.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: chaddr.pm,v 1.20 2003/08/23 04:35:32 fukachan Exp $ +# $FML: chaddr.pm,v 1.21 2003/08/23 07:24:43 fukachan Exp $ # package FML::Command::User::chaddr; @@ -73,7 +73,7 @@ sub lock_channel { return 'command_serialize';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # # XXX-TODO: correct to use *_maps not primary_*_map for chaddr? diff --git a/fml/lib/FML/Command/User/confirm.pm b/fml/lib/FML/Command/User/confirm.pm index 18c00da4..628d0afc 100644 --- a/fml/lib/FML/Command/User/confirm.pm +++ b/fml/lib/FML/Command/User/confirm.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: confirm.pm,v 1.22 2003/08/23 04:35:33 fukachan Exp $ +# $FML: confirm.pm,v 1.23 2003/08/23 07:24:43 fukachan Exp $ # package FML::Command::User::confirm; @@ -66,7 +66,7 @@ sub lock_channel { return 'command_serialize';} sub notice_cc_recipient { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $maintainer = $config->{ maintainer }; return [ $maintainer ]; @@ -81,7 +81,7 @@ sub notice_cc_recipient sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # XXX-TODO: correct we handle only primary_*_map here? my $member_map = $config->{ primary_member_map }; diff --git a/fml/lib/FML/Command/User/digest.pm b/fml/lib/FML/Command/User/digest.pm index cdb9a227..3374640d 100644 --- a/fml/lib/FML/Command/User/digest.pm +++ b/fml/lib/FML/Command/User/digest.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: digest.pm,v 1.6 2003/08/23 04:35:33 fukachan Exp $ +# $FML: digest.pm,v 1.7 2003/08/23 07:24:44 fukachan Exp $ # package FML::Command::User::digest; @@ -68,7 +68,7 @@ sub lock_channel { return 'command_serialize';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # # XXX-TODO: correct to use primary_*_map for chaddr ? diff --git a/fml/lib/FML/Command/User/off.pm b/fml/lib/FML/Command/User/off.pm index 70bd2d90..f5a13769 100644 --- a/fml/lib/FML/Command/User/off.pm +++ b/fml/lib/FML/Command/User/off.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: off.pm,v 1.9 2003/08/23 04:35:33 fukachan Exp $ +# $FML: off.pm,v 1.10 2003/08/23 07:24:44 fukachan Exp $ # package FML::Command::User::off; @@ -70,7 +70,7 @@ sub lock_channel { return 'command_serialize';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # # XXX-TODO: correct to use primary_*_map for on/off ? diff --git a/fml/lib/FML/Command/User/on.pm b/fml/lib/FML/Command/User/on.pm index f9b7695c..3703eb4f 100644 --- a/fml/lib/FML/Command/User/on.pm +++ b/fml/lib/FML/Command/User/on.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: on.pm,v 1.9 2003/08/23 04:35:33 fukachan Exp $ +# $FML: on.pm,v 1.10 2003/08/23 07:24:44 fukachan Exp $ # package FML::Command::User::on; @@ -70,7 +70,7 @@ sub lock_channel { return 'command_serialize';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # # XXX-TODO: correct to use primary_*_map for on/off ? diff --git a/fml/lib/FML/Command/User/subscribe.pm b/fml/lib/FML/Command/User/subscribe.pm index 68cd28dc..370db4cc 100644 --- a/fml/lib/FML/Command/User/subscribe.pm +++ b/fml/lib/FML/Command/User/subscribe.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: subscribe.pm,v 1.20 2003/08/23 04:35:33 fukachan Exp $ +# $FML: subscribe.pm,v 1.21 2003/08/23 07:24:44 fukachan Exp $ # package FML::Command::User::subscribe; @@ -70,7 +70,7 @@ sub lock_channel { return 'command_serialize';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # XXX we handle primary_* . o.k. my $member_map = $config->{ primary_member_map }; diff --git a/fml/lib/FML/Command/User/summary.pm b/fml/lib/FML/Command/User/summary.pm index 9233e589..785235e0 100644 --- a/fml/lib/FML/Command/User/summary.pm +++ b/fml/lib/FML/Command/User/summary.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: summary.pm,v 1.14 2003/03/18 10:52:34 fukachan Exp $ +# $FML: summary.pm,v 1.15 2003/08/23 04:35:33 fukachan Exp $ # package FML::Command::User::summary; @@ -70,7 +70,7 @@ sub lock_channel { return 'article_spool_modify';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $summary_file = $config->{ "summary_file" }; if (-f $summary_file) { diff --git a/fml/lib/FML/Command/User/unsubscribe.pm b/fml/lib/FML/Command/User/unsubscribe.pm index b771333d..d9e9123e 100644 --- a/fml/lib/FML/Command/User/unsubscribe.pm +++ b/fml/lib/FML/Command/User/unsubscribe.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: unsubscribe.pm,v 1.20 2003/08/23 04:35:33 fukachan Exp $ +# $FML: unsubscribe.pm,v 1.21 2003/08/23 07:24:44 fukachan Exp $ # package FML::Command::User::unsubscribe; @@ -69,7 +69,7 @@ sub lock_channel { return 'command_serialize';} sub process { my ($self, $curproc, $command_args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # XXX-TODO: wrong to handle only primary_*_map in deluser phase. # XXX-TODO: we should check all maps? diff --git a/fml/lib/FML/Credential.pm b/fml/lib/FML/Credential.pm index b1318c08..b7e3c12e 100644 --- a/fml/lib/FML/Credential.pm +++ b/fml/lib/FML/Credential.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: Credential.pm,v 1.45 2003/03/18 10:37:01 fukachan Exp $ +# $FML: Credential.pm,v 1.46 2003/08/23 04:35:27 fukachan Exp $ # package FML::Credential; @@ -225,7 +225,7 @@ sub is_member { my ($self, $address) = @_; my $curproc = $self->{ _curproc }; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $member_maps = $config->get_as_array_ref('member_maps'); $self->_is_member({ @@ -243,7 +243,7 @@ sub is_privileged_member { my ($self, $address) = @_; my $curproc = $self->{ _curproc }; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $member_maps = $config->get_as_array_ref('admin_member_maps'); $self->_is_member({ @@ -261,7 +261,7 @@ sub is_recipient { my ($self, $address) = @_; my $curproc = $self->{ _curproc }; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $recipient_maps = $config->get_as_array_ref('recipient_maps'); $self->_is_member({ @@ -424,7 +424,7 @@ sub _get_address C<addr> matches a system account or not. The system accounts are given as - $curproc->{ config }->{ system_accounts }. + $curproc->config()->{ system_accounts }. =cut @@ -438,7 +438,7 @@ sub match_system_accounts { my ($self, $addr) = @_; my $curproc = $self->{ _curproc }; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # compare $user part of the sender address my ($user, $domain) = split(/\@/, $addr); diff --git a/fml/lib/FML/Digest.pm b/fml/lib/FML/Digest.pm index 8eaf6a8f..7b218732 100644 --- a/fml/lib/FML/Digest.pm +++ b/fml/lib/FML/Digest.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: Digest.pm,v 1.10 2003/08/23 04:35:27 fukachan Exp $ +# $FML: Digest.pm,v 1.11 2003/08/23 14:37:58 fukachan Exp $ # package FML::Digest; @@ -97,7 +97,7 @@ sub get_digest_id { my ($self) = @_; my $curproc = $self->{ _curproc }; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $seq_file = $config->{ digest_sequence_file }; return $self->_get_id($seq_file); @@ -152,7 +152,7 @@ sub set_digest_id { my ($self, $id) = @_; my $curproc = $self->{ _curproc }; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $seq_file = $config->{ digest_sequence_file }; my $channel = $self->get_lock_channel_name(); @@ -182,7 +182,7 @@ sub create_multipart_message my ($self, $optargs) = @_; my $range = $optargs->{ range }; my $curproc = $self->{ _curproc }; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_name = $config->{ ml_name }; my $ml_addr = $config->{ address_for_post }; my $charset = $config->{ template_file_charset }; diff --git a/fml/lib/FML/Error.pm b/fml/lib/FML/Error.pm index e7b82bd3..27398bdd 100644 --- a/fml/lib/FML/Error.pm +++ b/fml/lib/FML/Error.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: Error.pm,v 1.23 2003/05/28 14:33:42 fukachan Exp $ +# $FML: Error.pm,v 1.24 2003/08/23 14:37:58 fukachan Exp $ # package FML::Error; @@ -384,7 +384,7 @@ sub deluser { my ($self, $address) = @_; my $curproc = $self->{ _curproc }; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_name = $config->{ ml_name }; use FML::Restriction::Base; diff --git a/fml/lib/FML/Error/Cache.pm b/fml/lib/FML/Error/Cache.pm index 8aad6f9f..5d78aa80 100644 --- a/fml/lib/FML/Error/Cache.pm +++ b/fml/lib/FML/Error/Cache.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: Cache.pm,v 1.12 2003/08/23 04:35:34 fukachan Exp $ +# $FML: Cache.pm,v 1.13 2003/08/23 14:38:00 fukachan Exp $ # package FML::Error::Cache; @@ -213,7 +213,7 @@ sub _open_cache { my ($self) = @_; my $curproc = $self->{ _curproc }; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $type = $config->{ error_analyzer_cache_type }; my $dir = $config->{ error_analyzer_cache_dir }; my $mode = $config->{ error_analyzer_cache_mode } || 'temporal'; diff --git a/fml/lib/FML/Header/MessageID.pm b/fml/lib/FML/Header/MessageID.pm index e1a02a35..2426263f 100644 --- a/fml/lib/FML/Header/MessageID.pm +++ b/fml/lib/FML/Header/MessageID.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: MessageID.pm,v 1.12 2003/08/23 04:35:36 fukachan Exp $ +# $FML: MessageID.pm,v 1.13 2003/08/23 15:33:14 fukachan Exp $ # package FML::Header::MessageID; @@ -168,7 +168,7 @@ generate and return a new message-id. sub gen_id { my ($self, $curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # XXX-TODO: if $config->{ address_for_post } undefined ? $Counter++; diff --git a/fml/lib/FML/MTAControl/Postfix.pm b/fml/lib/FML/MTAControl/Postfix.pm index ccd52c40..25bc359e 100644 --- a/fml/lib/FML/MTAControl/Postfix.pm +++ b/fml/lib/FML/MTAControl/Postfix.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: Postfix.pm,v 1.19 2003/02/11 11:04:43 fukachan Exp $ +# $FML: Postfix.pm,v 1.20 2003/05/13 09:30:09 fukachan Exp $ # package FML::MTAControl::Postfix; @@ -38,7 +38,7 @@ set up aliases and virtual maps for postfix. sub postfix_install_alias { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $template_dir = $curproc->template_files_dir_for_newml(); use File::Spec; @@ -69,7 +69,7 @@ sub postfix_install_alias sub postfix_remove_alias { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $alias = $config->{ mail_aliases_file }; my $alias_new = $alias."new.$$"; my $ml_name = $params->{ ml_name }; @@ -129,7 +129,7 @@ sub postfix_remove_alias sub postfix_update_alias { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $prog = $config->{ path_postalias }; my $alias = $config->{ mail_aliases_file }; @@ -226,7 +226,7 @@ sub _find_key_in_file sub postfix_get_aliases_as_hash_ref { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $alias_file = $config->{ mail_aliases_file }; my $key = $optargs->{ key }; my $mode = $optargs->{ mode }; @@ -282,7 +282,7 @@ sub postfix_get_aliases_as_hash_ref sub postfix_alias_maps { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $prog = $config->{ path_postconf }; my $maps = ''; @@ -312,7 +312,7 @@ sub postfix_alias_maps sub postfix_setup { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $template_dir = $curproc->template_files_dir_for_newml(); my $ml_home_dir = $params->{ ml_home_dir }; @@ -338,7 +338,7 @@ sub postfix_setup sub _postfix_rewrite_virtual_params { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_name = $config->{ ml_name }; my $ml_domain = $config->{ ml_domain }; @@ -357,7 +357,7 @@ sub postfix_install_virtual_map { my ($self, $curproc, $params, $optargs) = @_; my $template_dir = $curproc->template_files_dir_for_newml(); - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_name = $config->{ ml_name }; my $ml_domain = $config->{ ml_domain }; my $postmap = $config->{ path_postmap }; @@ -397,7 +397,7 @@ sub postfix_install_virtual_map sub postfix_remove_virtual_map { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $map = $config->{ postfix_virtual_map_file }; my $key = $params->{ ml_name }; my $p = { @@ -416,7 +416,7 @@ sub postfix_remove_virtual_map sub postfix_update_virtual_map { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $postmap = $config->{ path_postmap }; my $virtual = $config->{ postfix_virtual_map_file }; diff --git a/fml/lib/FML/MTAControl/Procmail.pm b/fml/lib/FML/MTAControl/Procmail.pm index b3bd37b0..6ed07efe 100644 --- a/fml/lib/FML/MTAControl/Procmail.pm +++ b/fml/lib/FML/MTAControl/Procmail.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: Procmail.pm,v 1.10 2003/03/06 10:11:18 fukachan Exp $ +# $FML: Procmail.pm,v 1.11 2003/03/28 10:32:22 fukachan Exp $ # package FML::MTAControl::Procmail; @@ -38,7 +38,7 @@ set up aliases and virtual maps for procmail. sub procmail_install_alias { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $template_dir = $curproc->template_files_dir_for_newml(); use File::Spec; @@ -64,7 +64,7 @@ sub procmail_install_alias sub procmail_remove_alias { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $alias = $config->{ procmail_aliases_file }; my $alias_new = $alias."new.$$"; my $ml_name = $params->{ ml_name }; @@ -165,7 +165,7 @@ sub procmail_find_key_in_alias_maps sub procmail_get_aliases_as_hash_ref { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $alias_file = $config->{ mail_aliases_file }; my $key = $optargs->{ key }; my $mode = $optargs->{ mode }; diff --git a/fml/lib/FML/MTAControl/Qmail.pm b/fml/lib/FML/MTAControl/Qmail.pm index 88e85053..d2817aad 100644 --- a/fml/lib/FML/MTAControl/Qmail.pm +++ b/fml/lib/FML/MTAControl/Qmail.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: Qmail.pm,v 1.15 2003/01/11 16:05:16 fukachan Exp $ +# $FML: Qmail.pm,v 1.16 2003/01/27 03:23:17 fukachan Exp $ # package FML::MTAControl::Qmail; @@ -49,7 +49,7 @@ sub qmail_install_alias sub qmail_remove_alias { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $template_dir = $curproc->template_files_dir_for_newml(); my $ml_home_dir = $params->{ ml_home_dir }; @@ -137,7 +137,7 @@ sub qmail_alias_maps sub qmail_setup { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $template_dir = $curproc->template_files_dir_for_newml(); my $ml_home_dir = $params->{ ml_home_dir }; @@ -187,7 +187,7 @@ sub qmail_install_virtual_map { my ($self, $curproc, $params) = @_; my $fmlowner = $curproc->fml_owner(); - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_domain = $config->{ ml_domain }; my $virtual = $config->{ qmail_virtual_map_file }; diff --git a/fml/lib/FML/MTAControl/Sendmail.pm b/fml/lib/FML/MTAControl/Sendmail.pm index f4a9e6fe..63bac2bb 100644 --- a/fml/lib/FML/MTAControl/Sendmail.pm +++ b/fml/lib/FML/MTAControl/Sendmail.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: Sendmail.pm,v 1.4 2003/03/05 05:36:31 tmu Exp $ +# $FML: Sendmail.pm,v 1.5 2003/05/13 09:30:09 fukachan Exp $ # package FML::MTAControl::Sendmail; @@ -65,7 +65,7 @@ sub sendmail_remove_alias sub sendmail_update_alias { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $prog = $config->{ path_sendmail }; my $alias = $config->{ mail_aliases_file }; @@ -152,7 +152,7 @@ sub sendmail_install_virtual_map { my ($self, $curproc, $params, $optargs) = @_; my $template_dir = $curproc->template_files_dir_for_newml(); - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_name = $config->{ ml_name }; my $ml_domain = $config->{ ml_domain }; @@ -192,7 +192,7 @@ sub sendmail_install_virtual_map sub sendmail_remove_virtual_map { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $map = $config->{ sendmail_virtual_map_file }; my $key = $params->{ ml_name }; my $p = { @@ -211,7 +211,7 @@ sub sendmail_remove_virtual_map sub sendmail_update_virtual_map { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $makemap = $config->{ path_makemap }; my $virtual = $config->{ sendmail_virtual_map_file }; @@ -245,7 +245,7 @@ get map types supported by makemap. sub sendmail_supported_map_types { my ($self, $curproc, $params, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $makemap = $config->{ path_makemap }; if (-x $makemap) { diff --git a/fml/lib/FML/Mailer.pm b/fml/lib/FML/Mailer.pm index 6de2776e..d4341aec 100644 --- a/fml/lib/FML/Mailer.pm +++ b/fml/lib/FML/Mailer.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: Mailer.pm,v 1.21 2003/08/23 15:33:11 fukachan Exp $ +# $FML: Mailer.pm,v 1.22 2003/08/25 14:13:57 fukachan Exp $ # package FML::Mailer; @@ -105,7 +105,7 @@ sub send # $curproc is given in usual fml processes. # but not in other programs. if (defined $curproc) { - my $config = $curproc->{ config }; + my $config = $curproc->config(); $maintainer = $config->{ maintainer } if defined $config; # default log functions @@ -181,7 +181,7 @@ sub send # # main # - my $config = $curproc->{ config }; + my $config = $curproc->config(); use Mail::Delivery; my $service = new Mail::Delivery { log_function => $fp, diff --git a/fml/lib/FML/Parse.pm b/fml/lib/FML/Parse.pm index f721850e..3ba353ea 100644 --- a/fml/lib/FML/Parse.pm +++ b/fml/lib/FML/Parse.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: Parse.pm,v 1.29 2003/01/11 06:58:45 fukachan Exp $ +# $FML: Parse.pm,v 1.30 2003/08/23 07:24:40 fukachan Exp $ # package FML::Parse; @@ -75,7 +75,7 @@ sub _parse $curproc->log("read header=$header_size body=$body_size"); if (defined $msg->envelope_sender()) { - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); if (defined $pcb) { $pcb->set('credential', 'unix-from', $msg->envelope_sender()); } diff --git a/fml/lib/FML/Process/Addr.pm b/fml/lib/FML/Process/Addr.pm index 9de628a6..e39c89b3 100644 --- a/fml/lib/FML/Process/Addr.pm +++ b/fml/lib/FML/Process/Addr.pm @@ -3,7 +3,7 @@ # Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Addr.pm,v 1.9 2003/08/23 04:43:40 fukachan Exp $ +# $FML: Addr.pm,v 1.10 2003/08/23 07:24:45 fukachan Exp $ # package FML::Process::Addr; @@ -75,7 +75,7 @@ sub new sub prepare { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmladdr_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -99,7 +99,7 @@ sub verify_request my ($curproc, $args) = @_; my $argv = $curproc->command_line_argv(); my $len = $#$argv + 1; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmladdr_verify_request_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -135,7 +135,7 @@ See <FML::Process::Switch()> on C<$args> for more details. sub run { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $myname = $curproc->myname(); my $argv = $curproc->command_line_argv(); @@ -150,7 +150,7 @@ sub run sub finish { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmladdr_finish_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -211,7 +211,7 @@ See <FML::Process::Switch()> on C<$args> for more details. sub _fmladdr { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmladdr_run_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } diff --git a/fml/lib/FML/Process/Alias.pm b/fml/lib/FML/Process/Alias.pm index 5d242036..b2352253 100644 --- a/fml/lib/FML/Process/Alias.pm +++ b/fml/lib/FML/Process/Alias.pm @@ -3,7 +3,7 @@ # Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Alias.pm,v 1.10 2003/08/23 04:43:41 fukachan Exp $ +# $FML: Alias.pm,v 1.11 2003/08/23 07:24:46 fukachan Exp $ # package FML::Process::Alias; @@ -71,7 +71,7 @@ sub new sub prepare { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmlalias_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -95,7 +95,7 @@ sub verify_request my ($curproc, $args) = @_; my $argv = $curproc->command_line_argv(); my $len = $#$argv + 1; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmlalias_verify_request_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -129,7 +129,7 @@ See <FML::Process::Switch()> on C<$args> for more details. sub run { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $myname = $curproc->myname(); my $argv = $curproc->command_line_argv(); @@ -144,7 +144,7 @@ sub run sub finish { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmlalias_finish_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -209,7 +209,7 @@ See <FML::Process::Switch()> on C<$args> for more details. sub _fmlalias { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmlalias_run_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } diff --git a/fml/lib/FML/Process/CGI/Kernel.pm b/fml/lib/FML/Process/CGI/Kernel.pm index ee87a033..f99b71e4 100644 --- a/fml/lib/FML/Process/CGI/Kernel.pm +++ b/fml/lib/FML/Process/CGI/Kernel.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: Kernel.pm,v 1.50 2003/08/23 04:35:41 fukachan Exp $ +# $FML: Kernel.pm,v 1.51 2003/08/23 07:24:49 fukachan Exp $ # package FML::Process::CGI::Kernel; @@ -108,7 +108,7 @@ sub prepare sub _cgi_resolve_ml_specific_variables { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my ($ml_home_dir, $config_cf); # inherit ml_domain from $hints @@ -578,7 +578,7 @@ execute cgi_menu() given as FML::Command::* sub run_cgi_menu { my ($curproc, $args) = @_; - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); my $command_args = $pcb->get('cgi', 'command_args'); if (defined $command_args) { diff --git a/fml/lib/FML/Process/Calendar.pm b/fml/lib/FML/Process/Calendar.pm index e2a9ed31..0d59c505 100644 --- a/fml/lib/FML/Process/Calendar.pm +++ b/fml/lib/FML/Process/Calendar.pm @@ -3,7 +3,7 @@ # Copyright (C) 2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Calendar.pm,v 1.3 2003/03/06 04:15:35 fukachan Exp $ +# $FML: Calendar.pm,v 1.4 2003/08/23 04:35:38 fukachan Exp $ # package FML::Process::Calendar; @@ -72,7 +72,7 @@ sub prepare # load default configurations. use FML::Config; - $curproc->{ config } = new FML::Config; + $curproc->config() = new FML::Config; $curproc->load_config_files( $args->{ cf_list } ); } diff --git a/fml/lib/FML/Process/Command.pm b/fml/lib/FML/Process/Command.pm index a4a7461f..eb8278da 100644 --- a/fml/lib/FML/Process/Command.pm +++ b/fml/lib/FML/Process/Command.pm @@ -3,7 +3,7 @@ # Copyright (C) 2000,2001,2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Command.pm,v 1.87 2003/08/23 04:35:38 fukachan Exp $ +# $FML: Command.pm,v 1.88 2003/08/23 07:24:46 fukachan Exp $ # package FML::Process::Command; @@ -75,7 +75,7 @@ parse the incoming message. sub prepare { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'command_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -112,7 +112,7 @@ verify the sender is a valid member or not. sub verify_request { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'command_verify_request_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -186,8 +186,8 @@ XXX Each command determines need of lock or not. sub run { my ($curproc, $args) = @_; - my $pcb = $curproc->{ pcb }; - my $config = $curproc->{ config }; + my $pcb = $curproc->pcb(); + my $config = $curproc->config(); my $eval = $config->get_hook( 'command_run_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -272,7 +272,7 @@ queue flush and send back the results or error messages. sub finish { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'command_finish_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -316,7 +316,7 @@ sub _check_context sub _config_permit_command { my ($curproc, $args, $level, $opts) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $cred = $curproc->{ credential }; # user credential my $prompt = $config->{ command_prompt } || '>>>'; my $comname = $opts->{ comname }; @@ -354,7 +354,7 @@ sub _config_permit_command sub _is_safe_syntax { my ($curproc, $args, $status, $cominfo) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $prompt = $config->{ command_prompt } || '>>>'; my $level = $status->{ level }; my $command = $cominfo->{ command }; @@ -391,7 +391,7 @@ sub _is_safe_syntax sub _parse_command_args { my ($curproc, $args, $fixed_command) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_name = $config->{ ml_name }; my $argv = $curproc->command_line_argv(); @@ -448,7 +448,7 @@ sub _try_admin_auth $obj = new FML::Command::Auth; }; unless ($@) { - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $rules = $config->get_as_array_ref('admin_command_restrictions'); for my $rule (@$rules) { $is_auth = $obj->$rule($curproc, $args, $optargs); @@ -487,7 +487,7 @@ sub _try_admin_auth sub _get_command_mode { my ($curproc, $args, $status, $command_info) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $command = $command_info->{ command }; my $comname = $command_info->{ comname }; my $comsubname = $command_info->{ comsubname }; @@ -736,7 +736,7 @@ sub __clean_up sub __stop_here { my ($curproc, $args, $status, $cominfo, $orig_command) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $prompt = $config->{ command_prompt } || '>>>'; my $key = $status->{ _stop_reason_key }; my $str = $status->{ _stop_reason_str }; @@ -764,7 +764,7 @@ sub __stop_here sub _evaluate_command_lines { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_name = $config->{ ml_name }; my $argv = $curproc->command_line_argv(); my $prompt = $config->{ command_prompt } || '>>>'; diff --git a/fml/lib/FML/Process/ConfViewer.pm b/fml/lib/FML/Process/ConfViewer.pm index 22cec004..f6af5ac9 100644 --- a/fml/lib/FML/Process/ConfViewer.pm +++ b/fml/lib/FML/Process/ConfViewer.pm @@ -3,7 +3,7 @@ # Copyright (C) 2000,2001,2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: ConfViewer.pm,v 1.22 2003/08/23 04:43:41 fukachan Exp $ +# $FML: ConfViewer.pm,v 1.23 2003/08/24 14:12:18 fukachan Exp $ # package FML::Process::ConfViewer; @@ -69,7 +69,7 @@ sub new sub prepare { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmlconf_prepare_start_hook' ); if ($eval) { @@ -98,7 +98,7 @@ sub verify_request { my ($curproc, $args) = @_; my $argv = $curproc->command_line_argv(); - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmlconf_verify_request_start_hook' ); if ($eval) { @@ -139,7 +139,7 @@ See <FML::Process::Switch()> on C<$args> for more details. sub run { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $myname = $curproc->myname(); my $argv = $curproc->command_line_argv(); @@ -194,7 +194,7 @@ _EOF_ sub finish { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmlconf_finish_start_hook' ); if ($eval) { @@ -224,7 +224,7 @@ run dump_variables of C<FML::Config>. sub _fmlconf { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $mode = $args->{ options }->{ n } ? 'difference_only' : 'all'; my $argv = $curproc->command_line_argv(); diff --git a/fml/lib/FML/Process/Configure.pm b/fml/lib/FML/Process/Configure.pm index c8fa69fa..f4c4c7ba 100644 --- a/fml/lib/FML/Process/Configure.pm +++ b/fml/lib/FML/Process/Configure.pm @@ -3,7 +3,7 @@ # Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Configure.pm,v 1.53 2003/08/23 04:43:41 fukachan Exp $ +# $FML: Configure.pm,v 1.54 2003/08/23 07:24:46 fukachan Exp $ # package FML::Process::Configure; @@ -72,7 +72,7 @@ sub new sub prepare { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'makefml_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -97,7 +97,7 @@ sub verify_request my ($curproc, $args) = @_; my $argv = $curproc->command_line_argv(); my $len = $#$argv + 1; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'makefml_verify_request_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -133,7 +133,7 @@ See <FML::Process::Switch()> on C<$args> for more details. sub run { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $myname = $curproc->myname(); my $argv = $curproc->command_line_argv(); @@ -148,7 +148,7 @@ sub run sub finish { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'makefml_finish_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -273,7 +273,7 @@ See <FML::Process::Switch()> on C<$args> for more details. sub _makefml { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $ml_name = $config->{ ml_name }; my $myname = $curproc->myname(); my $argv = $curproc->command_line_argv(); diff --git a/fml/lib/FML/Process/Digest.pm b/fml/lib/FML/Process/Digest.pm index db42224c..28cea281 100644 --- a/fml/lib/FML/Process/Digest.pm +++ b/fml/lib/FML/Process/Digest.pm @@ -3,7 +3,7 @@ # Copyright (C) 2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Digest.pm,v 1.9 2003/08/23 07:24:46 fukachan Exp $ +# $FML: Digest.pm,v 1.10 2003/08/23 15:33:14 fukachan Exp $ # package FML::Process::Digest; @@ -76,7 +76,7 @@ fix @INC. sub prepare { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'digest_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -110,7 +110,7 @@ set up the mail sender. sub verify_request { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $maintainer = $config->{ maintainer }; my $eval = $config->get_hook( 'digest_verify_request_start_hook' ); @@ -148,7 +148,7 @@ Lastly we unlock the current process. sub run { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $maintainer = $config->{ maintainer }; my $sender = $curproc->{'credential'}->{'sender'}; @@ -207,7 +207,7 @@ If needed, we send back error messages to the mail sender. sub finish { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'digest_finish_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm index 7c0cdcb2..8c27dde2 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.123 2003/08/23 04:43:41 fukachan Exp $ +# $FML: Distribute.pm,v 1.124 2003/08/23 07:24:46 fukachan Exp $ # package FML::Process::Distribute; @@ -75,7 +75,7 @@ adjust ml_* and load configuration files. sub prepare { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'distribute_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -115,7 +115,7 @@ check the mail sender and the mail loop possibility. sub verify_request { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'distribute_verify_request_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -194,7 +194,7 @@ Lastly we unlock the current process. sub run { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $maintainer = $config->{ maintainer }; my $sender = $curproc->{'credential'}->{'sender'}; my $data_type = @@ -215,7 +215,7 @@ sub run $curproc->_distribute($args); } else { - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); $curproc->log("deny article submission"); @@ -318,7 +318,7 @@ If needed, we send back error messages to the mail sender. sub finish { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'distribute_finish_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -421,7 +421,7 @@ sub _build_article_object sub _header_rewrite { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $header = $curproc->article_message_header(); my $rules = $config->get_as_array_ref('article_header_rewrite_rules'); my $id = $args->{ id }; @@ -450,7 +450,7 @@ sub _deliver_article { my ($curproc, $args) = @_; my $cred = $curproc->{ credential }; - my $config = $curproc->{ config }; # FML::Config object + my $config = $curproc->config(); # FML::Config object my $message = $curproc->article_message(); # Mail::Message object my $header = $curproc->article_message_header(); # FML::Header object my $body = $curproc->article_message_body(); # Mail::Message object @@ -520,8 +520,8 @@ sub _deliver_article sub _old_thread_check { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; - my $pcb = $curproc->{ pcb }; + my $config = $curproc->config(); + my $pcb = $curproc->pcb(); my $myname = $curproc->myname(); my $ml_name = $config->{ ml_name }; diff --git a/fml/lib/FML/Process/DocViewer.pm b/fml/lib/FML/Process/DocViewer.pm index 910f7c1d..f5ee9c8b 100644 --- a/fml/lib/FML/Process/DocViewer.pm +++ b/fml/lib/FML/Process/DocViewer.pm @@ -3,7 +3,7 @@ # Copyright (C) 2000,2001,2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: DocViewer.pm,v 1.24 2003/08/23 04:35:39 fukachan Exp $ +# $FML: DocViewer.pm,v 1.25 2003/08/23 07:24:47 fukachan Exp $ # package FML::Process::DocViewer; @@ -75,7 +75,7 @@ sub new sub prepare { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmldoc_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -98,7 +98,7 @@ sub verify_request { my ($curproc, $args) = @_; my $argv = $curproc->command_line_argv(); - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmldoc_verify_request_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -129,7 +129,7 @@ C<fmlconf($args)>. sub run { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $myname = $curproc->myname(); my $argv = $curproc->command_line_argv(); @@ -144,7 +144,7 @@ sub run sub _fmldoc { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $myname = $curproc->myname(); my $argv = $curproc->command_line_argv(); @@ -216,7 +216,7 @@ finalize. sub finish { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmldoc_finish_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } diff --git a/fml/lib/FML/Process/Error.pm b/fml/lib/FML/Process/Error.pm index d71a32da..aae15a2e 100644 --- a/fml/lib/FML/Process/Error.pm +++ b/fml/lib/FML/Process/Error.pm @@ -3,7 +3,7 @@ # Copyright (C) 2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Error.pm,v 1.32 2003/08/23 04:35:39 fukachan Exp $ +# $FML: Error.pm,v 1.33 2003/08/23 07:24:47 fukachan Exp $ # package FML::Process::Error; @@ -71,7 +71,7 @@ if $use_error_analyzer_program, parse incoming message. sub prepare { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'error_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -107,7 +107,7 @@ dummy. sub verify_request { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $maintainer = $config->{ maintainer }; my $eval = $config->get_hook( 'error_verify_request_start_hook' ); @@ -145,9 +145,9 @@ XXX Each command determines need of lock or not. sub run { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $found = 0; - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); my $msg = $curproc->incoming_message(); my $eval = $config->get_hook( 'error_run_start_hook' ); @@ -267,8 +267,8 @@ _EOF_ sub finish { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; - my $pcb = $curproc->{ pcb }; + my $config = $curproc->config(); + my $pcb = $curproc->pcb(); my $eval = $config->get_hook( 'error_finish_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } diff --git a/fml/lib/FML/Process/HTMLify.pm b/fml/lib/FML/Process/HTMLify.pm index 53c280c9..02599ddf 100644 --- a/fml/lib/FML/Process/HTMLify.pm +++ b/fml/lib/FML/Process/HTMLify.pm @@ -3,7 +3,7 @@ # Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: HTMLify.pm,v 1.28 2003/08/23 04:35:39 fukachan Exp $ +# $FML: HTMLify.pm,v 1.29 2003/08/23 07:24:47 fukachan Exp $ # package FML::Process::HTMLify; @@ -66,7 +66,7 @@ sub new sub prepare { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmlhtmlify_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -87,7 +87,7 @@ sub prepare sub verify_request { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmlhtmlify_verify_request_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } @@ -111,7 +111,7 @@ call &FML::Command::HTMLify::convert(). sub run { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $argv = $curproc->command_line_argv(); my $options = $curproc->command_line_options(); my $src_dir = $argv->[0]; @@ -168,7 +168,7 @@ _EOF_ sub finish { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $eval = $config->get_hook( 'fmlhtmlify_finish_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm index ff4d3193..5f759759 100644 --- a/fml/lib/FML/Process/Kernel.pm +++ b/fml/lib/FML/Process/Kernel.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: Kernel.pm,v 1.174 2003/08/23 05:29:01 fukachan Exp $ +# $FML: Kernel.pm,v 1.175 2003/08/23 07:24:48 fukachan Exp $ # package FML::Process::Kernel; @@ -58,8 +58,8 @@ in the process flow. 3. initialize current process struct C<$curproc> such as $curproc->{ main_cf } - $curproc->{ config } - $curproc->{ pcb } + $curproc->config() + $curproc->pcb() For example, this C<main_cf> provides the pointer to /etc/fml/main.cf parameters. @@ -129,11 +129,11 @@ sub new # 3.2 bind FML::Config object to $curproc use FML::Config; - $curproc->{ config } = new FML::Config $cfargs; + $curproc->config() = new FML::Config $cfargs; # 3.3 initialize PCB (Process Control Block) use FML::PCB; - $curproc->{ pcb } = new FML::PCB; + $curproc->pcb() = new FML::PCB; # 3.4 # object-ify. bless! bless! bless! @@ -313,7 +313,7 @@ sub unlock # initialize ($channel, $lock_file) = $curproc->_lock_init($channel); - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); my $lockobj = $pcb->get('lock', $channel); if (defined $lockobj) { @@ -346,7 +346,7 @@ sub unlock sub _lock_init { my ($curproc, $channel) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $home_dir = $config->{ ml_home_dir }; my $lock_dir = $config->{ lock_dir }; my $lock_type = $config->{ lock_type }; @@ -564,7 +564,7 @@ See C<FML::Header> object for more details. sub simple_loop_check { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $header = $curproc->incoming_message_header(); my $rules = $config->get_as_array_ref( 'header_loop_check_rules' ); my $match = 0; @@ -616,7 +616,7 @@ sub resolve_ml_specific_variables my ($curproc, $args) = @_; my ($ml_name, $ml_domain, $ml_home_prefix, $ml_home_dir); my ($command, @options, $config_cf_path); - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $myname = $args->{ myname }; my $ml_addr = ''; @@ -765,7 +765,7 @@ my @delayed_buffer = (); sub __debug_ml_xxx { my ($curproc, $str) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); if (defined $config->{ log_file } && (-w $config->{ log_file })) { for my $buf (@delayed_buffer) { $curproc->log( $buf ); } @@ -857,12 +857,12 @@ sub load_config_files # load configuration variables from given files e.g. /some/where.cf # XXX overload variables from each $cf for my $cf (@$files) { - $curproc->{ config }->overload( $cf ); + $curproc->config()->overload( $cf ); } # XXX We need to expand variables after we load all *cf files. # XXX 2001/05/05 changed to dynamic expansion for hook - # $curproc->{ config }->expand_variables(); + # $curproc->config()->expand_variables(); # XXX simple sanity check # MAIL_LIST != MAINTAINER @@ -886,7 +886,7 @@ sub load_config_files sub fix_perl_include_path { my ($curproc) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # XXX update @INC here since we should do after loading configurations. # update @INC for ml local libraries @@ -938,7 +938,7 @@ sub parse_incoming_message $curproc->{ incoming_message }->{ body } = $msg->whole_message_body; # save input message for further investigation - my $config = $curproc->{ config }; + my $config = $curproc->config(); if ($config->yes('use_incoming_mail_cache')) { my $dir = $config->{ incoming_mail_cache_dir }; my $modulus = $config->{ incoming_mail_cache_size }; @@ -1004,7 +1004,7 @@ sub _check_restrictions my ($curproc, $args, $type) = @_; my $config = $curproc->config(); my $cred = $curproc->{ credential }; # user credential - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); my $sender = $cred->sender(); my $rules = $config->get_as_array_ref( "${type}_restrictions" ); @@ -1389,7 +1389,7 @@ sub _array_is_different sub _append_message_into_queue { my ($curproc, $msg, $args, $recipient, $recipient_maps, $hdr) = @_; - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); my $category = 'reply_message'; my $class = 'queue'; my $rarray = $pcb->get($category, $class) || []; @@ -1414,7 +1414,7 @@ sub _append_message_into_queue sub _append_message_into_queue2 { my ($curproc, $msg, $args, $recipient, $recipient_maps, $hdr) = @_; - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); my $category = 'reply_message'; my $class = 'queue'; my $rarray = $pcb->get($category, $class) || []; @@ -1451,7 +1451,7 @@ sub _append_message_into_queue2 sub _reply_message_recipient_keys { my ($curproc, $msg, $args) = @_; - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); my $category = 'reply_message'; my $class = 'queue'; my $rarray = $pcb->get($category, $class) || []; @@ -1539,7 +1539,7 @@ This $args is passed through to reply_message(). sub reply_message_nl { my ($curproc, $class, $default_msg, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $buf = $curproc->message_nl($class, $default_msg, $args); $curproc->caller_info($class, caller) if $debug; @@ -1585,7 +1585,7 @@ sub reply_message_add_header_info sub message_nl { my ($curproc, $class, $default_msg, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $dir = $config->{ message_template_dir }; my $local_dir = $config->{ ml_local_message_template_dir }; my $charset = $config->{ template_file_charset } || 'en'; @@ -1659,7 +1659,7 @@ Prepare the message and queue it in by C<Mail::Delivery::Queue>. sub inform_reply_messages { my ($curproc, $args) = @_; - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); # We should classify reply messages by # a set of ( category, recipient(s) , + more ? what ??? ); @@ -1700,8 +1700,8 @@ sub inform_reply_messages sub queue_in { my ($curproc, $category, $optargs) = @_; - my $pcb = $curproc->{ pcb }; - my $config = $curproc->{ config }; + my $pcb = $curproc->pcb(); + my $config = $curproc->config(); my $sender = $config->{ maintainer }; my $charset = $config->{ "${category}_charset" } || 'us-ascii'; my $subject = $config->{ "${category}_subject" }; @@ -2012,7 +2012,7 @@ sub clean_up_tmpfiles sub temp_file_path { my ($curproc) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $tmp_dir = $config->{ tmp_dir }; $TmpFileCounter++; # ensure uniqueness @@ -2061,7 +2061,7 @@ C<TODO:> sub queue_flush { my ($curproc, $queue) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $queue_dir = $config->{ mail_queue_dir }; eval q{ @@ -2104,7 +2104,7 @@ C<Caution:> sub prepare_file_to_return { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $tmp_dir = $config->{ tmp_dir }; my $tmpf = File::Spec->catfile($tmp_dir, $$); my $src_file = $args->{ src }; @@ -2156,7 +2156,7 @@ sub prepare_file_to_return sub open_outgoing_message_channel { my ($curproc, $optargs) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # save message for further investigation if ($config->yes('use_outgoing_mail_cache')) { @@ -2216,7 +2216,7 @@ sub parse_exception sub set_umask_as_public { my ($curproc) = @_; - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); # reset umask since html archives should be public open. my $saved_umask = umask; @@ -2232,7 +2232,7 @@ sub set_umask_as_public sub reset_umask { my ($curproc) = @_; - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); my $saved_umask = $pcb->get('umask', 'saved_umask'); # back to the original umask; diff --git a/fml/lib/FML/Process/QMail.pm b/fml/lib/FML/Process/QMail.pm index e10d9d37..385738b7 100644 --- a/fml/lib/FML/Process/QMail.pm +++ b/fml/lib/FML/Process/QMail.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: QMail.pm,v 1.16 2003/08/23 07:24:48 fukachan Exp $ +# $FML: QMail.pm,v 1.17 2003/08/23 15:33:14 fukachan Exp $ # package FML::Process::QMail; @@ -67,7 +67,7 @@ C<NOT YET IMPLERMENTED>. sub DotQmailExt { my ($curproc, $args) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); # get ? my $ext = $ENV{'EXT'}; diff --git a/fml/lib/FML/Process/Utils.pm b/fml/lib/FML/Process/Utils.pm index 8e7b36d4..b5f9c9e0 100644 --- a/fml/lib/FML/Process/Utils.pm +++ b/fml/lib/FML/Process/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.73 2003/08/23 14:38:01 fukachan Exp $ +# $FML: Utils.pm,v 1.74 2003/08/25 14:13:58 fukachan Exp $ # package FML::Process::Utils; @@ -51,8 +51,8 @@ sub config { my ($curproc) = @_; - if (defined $curproc->{ config }) { - return $curproc->{ config }; + if (defined $curproc->config()) { + return $curproc->config(); } else { return undef; @@ -68,8 +68,8 @@ sub pcb { my ($curproc) = @_; - if (defined $curproc->{ pcb }) { - return $curproc->{ pcb }; + if (defined $curproc->pcb()) { + return $curproc->pcb(); } else { return undef; @@ -638,7 +638,7 @@ not yet implemenetd properly. (?) sub ml_name { my ($curproc) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); if (defined $config->{ ml_name } && $config->{ ml_name }) { return $config->{ ml_name }; @@ -664,7 +664,7 @@ properly, return the default domain defined in /etc/fml/main.cf. sub ml_domain { my ($curproc) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); if (defined $config->{ ml_domain } && $config->{ ml_domain }) { return $config->{ ml_domain }; @@ -919,7 +919,7 @@ sub config_cf_filepath my $prefix = $curproc->ml_home_prefix($domain); unless (defined $ml) { - $ml = $curproc->{ config }->{ ml_name }; + $ml = $curproc->config()->{ ml_name }; } use File::Spec; @@ -1054,7 +1054,7 @@ get ARRAY_REF of address list for the specified map. sub get_address_list { my ($curproc, $map) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $list = $config->get_as_array_ref( $map ); eval q{ use FML::Command::UserControl;}; @@ -1081,7 +1081,7 @@ which this $map belongs to ? sub which_map_nl { my ($curproc, $map) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $found = ''; SEARCH_MAPS: @@ -1209,7 +1209,7 @@ sub language_default sub language_of_cgi_message { my ($curproc) = @_; - my $config = $curproc->{ config }; + my $config = $curproc->config(); my $charset = $config->{ cgi_charset }; return( $charset || $curproc->language_default() ); diff --git a/fml/lib/FML/Restriction/Post.pm b/fml/lib/FML/Restriction/Post.pm index b707b594..1e9ef211 100644 --- a/fml/lib/FML/Restriction/Post.pm +++ b/fml/lib/FML/Restriction/Post.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: Post.pm,v 1.5 2003/08/03 14:46:41 fukachan Exp $ +# $FML: Post.pm,v 1.6 2003/08/23 14:38:01 fukachan Exp $ # package FML::Restriction::Post; @@ -52,7 +52,7 @@ sub reject_system_accounts my $curproc = $self->{ _curproc }; my $cred = $curproc->{ credential }; my $match = $cred->match_system_accounts($sender); - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); if ($match) { $curproc->log("${rule}: $match matches sender address"); @@ -87,7 +87,7 @@ sub permit_member_maps my ($self, $rule, $sender) = @_; my $curproc = $self->{ _curproc }; my $cred = $curproc->{ credential }; - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); # Q: the mail sender is a ML member? if ($cred->is_member($sender)) { @@ -126,7 +126,7 @@ sub permit_commands_for_stranger { my ($self, $rule, $sender) = @_; my $curproc = $self->{ _curproc }; - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); use FML::Command::DataCheck; my $check = new FML::Command::DataCheck; @@ -147,7 +147,7 @@ sub reject { my ($self, $rule, $sender) = @_; my $curproc = $self->{ _curproc }; - my $pcb = $curproc->{ pcb }; + my $pcb = $curproc->pcb(); unless ($pcb->get("check_restrictions", "deny_reason")) { $pcb->set("check_restrictions", "deny_reason", $rule); |