diff options
| author | fukachan <fukachan> | 2005-06-04 08:49:05 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2005-06-04 08:49:05 +0000 |
| commit | dde828a99ad5c8e0afc414ddcc98068aee21831e (patch) | |
| tree | 9aaefbf1d0dc89982df0d577404f036aeeeb63f1 | |
| parent | 798d46f20f1805d35c7a35f0a0ca6ac75926ddfa (diff) | |
| download | fml8-dde828a99ad5c8e0afc414ddcc98068aee21831e.tar.gz fml8-dde828a99ad5c8e0afc414ddcc98068aee21831e.tar.bz2 fml8-dde828a99ad5c8e0afc414ddcc98068aee21831e.zip | |
method naming fixed to $curproc->OBJ_METHOD() form (FNF).
get_article_id -> article_get_id
set_article_id -> article_set_id
config_files_append_to_list -> config_files_append
append_to_config_files_list -> config_files_append_to_list
get_config_files_list -> config_files_get_list
load_config_files -> config_files_load
set_config_files_list -> config_files_set_list
verify_sender_credential -> credential_verify_sender
get_current_process_ml_name -> current_process_get_ml_name
set_current_process_ml_name -> current_process_set_ml_name
fix_perl_include_path -> env_fix_perl_include_path
parse_exception -> exception_parse
parse_incoming_message -> incoming_message_parse
clean_up_incoming_queue -> incoming_message_queue_clean_up
get_cui_menu -> menu_get_cui_config_file_path
get_gui_menu -> menu_get_gui_config_file_path
resolve_ml_specific_variables -> ml_variables_resolve
outgoing_message_open_channel -> outgoing_message_cache_open
open_outgoing_message_channel -> outgoing_message_open_channel
inform_reply_messages -> reply_message_inform
prepare_file_to_return -> reply_message_prepare_template
clean_up_tmpfiles -> tmp_files_clean_up
reset_umask -> umask_reset
set_umask_as_public -> umask_set_as_public
| -rw-r--r-- | fml/lib/FML/Article/Sequence.pm | 6 | ||||
| -rw-r--r-- | fml/lib/FML/Command/SendFile.pm | 4 | ||||
| -rw-r--r-- | fml/lib/FML/Config/Menu.pm | 4 | ||||
| -rw-r--r-- | fml/lib/FML/Mailer.pm | 4 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Addr.pm | 8 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Alias.pm | 8 | ||||
| -rw-r--r-- | fml/lib/FML/Process/CGI/Kernel.pm | 16 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Calendar.pm | 4 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Command.pm | 14 | ||||
| -rw-r--r-- | fml/lib/FML/Process/ConfViewer.pm | 8 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Configure.pm | 10 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Digest.pm | 14 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Distribute.pm | 26 | ||||
| -rw-r--r-- | fml/lib/FML/Process/DocViewer.pm | 8 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Error.pm | 14 | ||||
| -rw-r--r-- | fml/lib/FML/Process/FetchFML.pm | 8 | ||||
| -rw-r--r-- | fml/lib/FML/Process/Flow.pm | 8 | ||||
| -rw-r--r-- | fml/lib/FML/Process/HTMLify.pm | 8 | ||||
| -rw-r--r-- | fml/lib/FML/Process/PGP.pm | 8 | ||||
| -rw-r--r-- | fml/lib/FML/Process/State.pm | 10 |
20 files changed, 95 insertions, 95 deletions
diff --git a/fml/lib/FML/Article/Sequence.pm b/fml/lib/FML/Article/Sequence.pm index 53f621ed..de0baa0a 100644 --- a/fml/lib/FML/Article/Sequence.pm +++ b/fml/lib/FML/Article/Sequence.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: Sequence.pm,v 1.14 2004/07/23 04:10:54 fukachan Exp $ +# $FML: Sequence.pm,v 1.15 2004/12/05 16:19:05 fukachan Exp $ # package FML::Article::Sequence; @@ -61,7 +61,7 @@ sub increment_id $curproc->unlock($lock_channel); unless ($error) { - # XXX-TODO: use $curproc->set_article_id(). + # XXX-TODO: use $curproc->article_set_id(). # save $id in pcb (process control block) and return $id $pcb->set('article', 'id', $id); @@ -90,7 +90,7 @@ sub id my $config = $curproc->config(); my $pcb = $curproc->pcb(); - # XXX-TODO: use $curproc->get_article_id(). + # XXX-TODO: use $curproc->article_get_id(). my $n = $pcb->get('article', 'id'); # within Process::Distribute diff --git a/fml/lib/FML/Command/SendFile.pm b/fml/lib/FML/Command/SendFile.pm index 5e008f49..b95482eb 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.41 2004/07/23 13:16:35 fukachan Exp $ +# $FML: SendFile.pm,v 1.42 2004/12/05 16:19:06 fukachan Exp $ # package FML::Command::SendFile; @@ -192,7 +192,7 @@ sub send_file src => $filepath, charset_out => $charset, }; - my $xxxx_template = $curproc->prepare_file_to_return( $params ); + my $xxxx_template = $curproc->reply_message_prepare_template( $params ); if (-f $xxxx_template) { my $rm_args = { diff --git a/fml/lib/FML/Config/Menu.pm b/fml/lib/FML/Config/Menu.pm index 5c43291e..967fa1fa 100644 --- a/fml/lib/FML/Config/Menu.pm +++ b/fml/lib/FML/Config/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.2 2004/11/21 07:01:32 fukachan Exp $ +# $FML: Menu.pm,v 1.3 2004/11/23 16:02:20 fukachan Exp $ # package FML::Config::Menu; @@ -62,7 +62,7 @@ sub _init { my ($self, $menu) = @_; my $curproc = $self->{ _curproc }; - my $menu_path = $curproc->get_cui_menu(); + my $menu_path = $curproc->menu_get_cui_config_file_path(); my ($i, $buf, $class); use FileHandle; diff --git a/fml/lib/FML/Mailer.pm b/fml/lib/FML/Mailer.pm index 674da739..96231c0c 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.29 2004/07/11 15:43:37 fukachan Exp $ +# $FML: Mailer.pm,v 1.30 2004/12/05 16:19:04 fukachan Exp $ # package FML::Mailer; @@ -113,7 +113,7 @@ sub send # overwrite smtp log channel $handle = \*STDOUT; - my $wh = $curproc->open_outgoing_message_channel(); + my $wh = $curproc->outgoing_message_cache_open(); if (defined $wh) { $sfp = sub { print $wh @_;}; $handle = undef ; # $wh; # to avoid log duplication. diff --git a/fml/lib/FML/Process/Addr.pm b/fml/lib/FML/Process/Addr.pm index 2858ba1d..b3ec4c48 100644 --- a/fml/lib/FML/Process/Addr.pm +++ b/fml/lib/FML/Process/Addr.pm @@ -3,7 +3,7 @@ # Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Addr.pm,v 1.19 2004/07/11 15:43:38 fukachan Exp $ +# $FML: Addr.pm,v 1.20 2005/05/27 03:03:36 fukachan Exp $ # package FML::Process::Addr; @@ -79,9 +79,9 @@ sub prepare my $eval = $config->get_hook( 'fmladdr_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - # $curproc->resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + # $curproc->ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); $eval = $config->get_hook( 'fmladdr_prepare_end_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 4f95ac31..84648faf 100644 --- a/fml/lib/FML/Process/Alias.pm +++ b/fml/lib/FML/Process/Alias.pm @@ -3,7 +3,7 @@ # Copyright (C) 2001,2002,2003,2004 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Alias.pm,v 1.19 2004/04/23 04:10:35 fukachan Exp $ +# $FML: Alias.pm,v 1.20 2004/07/11 15:43:38 fukachan Exp $ # package FML::Process::Alias; @@ -79,9 +79,9 @@ sub prepare my $eval = $config->get_hook( 'fmlalias_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - # $curproc->resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + # $curproc->ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); $eval = $config->get_hook( 'fmlalias_prepare_end_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 54c04ba8..90a1f293 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.84 2004/12/05 16:19:12 fukachan Exp $ +# $FML: Kernel.pm,v 1.85 2005/05/27 01:19:32 fukachan Exp $ # package FML::Process::CGI::Kernel; @@ -90,9 +90,9 @@ sub prepare { my ($curproc, $args) = @_; - $curproc->_cgi_resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + $curproc->_cgi_ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); # modified for admin/*.cgi unless ($curproc->cgi_var_ml_name()) { @@ -169,7 +169,7 @@ sub _http_accept_language # Arguments: OBJ($curproc) # Side Effects: update $config{ ml_* }, $args->{ cf_list } # Return Value: none -sub _cgi_resolve_ml_specific_variables +sub _cgi_ml_variables_resolve { my ($curproc) = @_; my $config = $curproc->config(); @@ -207,7 +207,7 @@ sub _cgi_resolve_ml_specific_variables # XXX-TODO: method name .. hmm. $curproc->$obj_$function(). # add this ml's config.cf to the .cf list. - $curproc->append_to_config_files_list($config_cf); + $curproc->config_files_append($config_cf); } else { $curproc->logdebug("no ml_name"); @@ -305,7 +305,7 @@ sub run sub _error_string { my ($curproc, $r) = @_; - my ($key, $msg) = $curproc->parse_exception($r); + my ($key, $msg) = $curproc->exception_parse($r); my $nlmsg = $curproc->message_nl($key); if ($r =~ /__ERROR_cgi\.insecure__/) { @@ -462,7 +462,7 @@ sub cgi_execute_command print "Error! $comname fails.\n<BR>\n"; if ($@ =~ /^(.*)\s+at\s+/) { my $reason = $1; - my ($key, $r) = $curproc->parse_exception($reason); + my ($key, $r) = $curproc->exception_parse($reason); my $buf = $curproc->message_nl($key); # XXX-TODO: validate output. diff --git a/fml/lib/FML/Process/Calendar.pm b/fml/lib/FML/Process/Calendar.pm index 375340a4..c2125068 100644 --- a/fml/lib/FML/Process/Calendar.pm +++ b/fml/lib/FML/Process/Calendar.pm @@ -3,7 +3,7 @@ # Copyright (C) 2002,2003,2004,2005 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Calendar.pm,v 1.15 2004/12/23 12:32:05 fukachan Exp $ +# $FML: Calendar.pm,v 1.16 2005/05/27 03:03:36 fukachan Exp $ # package FML::Process::Calendar; @@ -88,7 +88,7 @@ sub prepare # load default configurations. use FML::Config; $curproc->{ config } = new FML::Config; - $curproc->load_config_files(); + $curproc->config_files_load(); } diff --git a/fml/lib/FML/Process/Command.pm b/fml/lib/FML/Process/Command.pm index 9b483609..0cc5b52c 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,2004,2005 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Command.pm,v 1.111 2004/12/05 16:19:08 fukachan Exp $ +# $FML: Command.pm,v 1.112 2005/05/27 00:57:18 fukachan Exp $ # package FML::Process::Command; @@ -83,14 +83,14 @@ sub prepare my $eval = $config->get_hook( 'command_mail_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - $curproc->resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + $curproc->ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); $curproc->scheduler_init(); $curproc->log_message_init(); if ($config->yes('use_command_mail_function')) { - $curproc->parse_incoming_message(); + $curproc->incoming_message_parse(); } else { $curproc->logerror("use of command_mail_program prohibited"); @@ -121,7 +121,7 @@ sub verify_request my $eval = $config->get_hook( 'command_mail_verify_request_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - $curproc->verify_sender_credential(); + $curproc->credential_verify_sender(); unless ($curproc->is_refused()) { $curproc->_check_filter(); @@ -259,7 +259,7 @@ sub finish my $eval = $config->get_hook( 'command_mail_finish_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - $curproc->inform_reply_messages(); + $curproc->reply_message_inform(); $curproc->queue_flush(); $eval = $config->get_hook( 'command_mail_finish_end_hook' ); diff --git a/fml/lib/FML/Process/ConfViewer.pm b/fml/lib/FML/Process/ConfViewer.pm index ccdcf6c0..f6a9a9c4 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,2004,2005 Ken'ichi Fukamachi # All rights reserved. # -# $FML: ConfViewer.pm,v 1.31 2004/07/11 15:43:39 fukachan Exp $ +# $FML: ConfViewer.pm,v 1.32 2005/05/27 03:03:37 fukachan Exp $ # package FML::Process::ConfViewer; @@ -76,9 +76,9 @@ sub prepare $curproc->logwarn($@) if $@; } - $curproc->resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + $curproc->ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); $eval = $config->get_hook( 'fmlconf_prepare_end_hook' ); if ($eval) { diff --git a/fml/lib/FML/Process/Configure.pm b/fml/lib/FML/Process/Configure.pm index fcf1c3e4..852a175e 100644 --- a/fml/lib/FML/Process/Configure.pm +++ b/fml/lib/FML/Process/Configure.pm @@ -3,7 +3,7 @@ # Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Configure.pm,v 1.67 2004/12/05 16:19:09 fukachan Exp $ +# $FML: Configure.pm,v 1.68 2005/05/26 12:39:11 fukachan Exp $ # package FML::Process::Configure; @@ -76,9 +76,9 @@ sub prepare my $eval = $config->get_hook( 'makefml_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - $curproc->resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + $curproc->ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); $curproc->log_message_init(); $eval = $config->get_hook( 'makefml_prepare_end_hook' ); @@ -156,7 +156,7 @@ sub finish # --allow-send-message or --allow-reply-message option specified. if ($curproc->is_allow_reply_message()) { - $curproc->inform_reply_messages(); + $curproc->reply_message_inform(); $curproc->queue_flush(); } diff --git a/fml/lib/FML/Process/Digest.pm b/fml/lib/FML/Process/Digest.pm index c0480507..0be26d5f 100644 --- a/fml/lib/FML/Process/Digest.pm +++ b/fml/lib/FML/Process/Digest.pm @@ -3,7 +3,7 @@ # Copyright (C) 2002,2003,2004 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Digest.pm,v 1.20 2004/05/22 11:42:54 fukachan Exp $ +# $FML: Digest.pm,v 1.21 2004/07/23 13:16:42 fukachan Exp $ # package FML::Process::Digest; @@ -80,9 +80,9 @@ sub prepare my $eval = $config->get_hook( 'article_digest_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - $curproc->resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + $curproc->ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); $curproc->scheduler_init(); unless ($config->yes('use_article_digest_function')) { @@ -130,7 +130,7 @@ Firstly it locks (giant lock) the current process. If the mail sender is one of our mailing list member, we can digest the mail as an article. If not, we inform "you are not a member" which is sent by -C<inform_reply_messages()> in C<FML::Process::Kernel>. +C<reply_message_inform()> in C<FML::Process::Kernel>. Lastly we unlock the current process. @@ -211,7 +211,7 @@ sub finish my $eval = $config->get_hook( 'article_digest_finish_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - $curproc->inform_reply_messages(); + $curproc->reply_message_inform(); $curproc->queue_flush(); $eval = $config->get_hook( 'article_digest_finish_end_hook' ); @@ -230,7 +230,7 @@ sub _digest use FML::Digest; my $digest = new FML::Digest $curproc; - my $aid = $digest->get_article_id(); + my $aid = $digest->article_get_id(); my $did = $digest->get_digest_id(); # run digest proceess if article(s) not to send found. diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm index 12cfce9b..06f5eedb 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,2004,2005 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Distribute.pm,v 1.158 2004/12/05 16:19:09 fukachan Exp $ +# $FML: Distribute.pm,v 1.159 2005/05/27 00:59:13 fukachan Exp $ # package FML::Process::Distribute; @@ -80,14 +80,14 @@ sub prepare $eval .= $config->get_hook( 'article_post_prepare_start_hook' ) || ''; if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - $curproc->resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + $curproc->ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); $curproc->scheduler_init(); $curproc->log_message_init(); if ($config->yes('use_article_post_function')) { - $curproc->parse_incoming_message(); + $curproc->incoming_message_parse(); } else { $curproc->logerror("use of distribute_program prohibited"); @@ -123,7 +123,7 @@ sub verify_request $eval .= $config->get_hook( 'article_post_verify_request_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - $curproc->verify_sender_credential(); + $curproc->credential_verify_sender(); unless ($curproc->is_refused()) { $curproc->simple_loop_check(); @@ -199,7 +199,7 @@ Firstly it locks (giant lock) the current process. If the mail sender is one of our mailing list member, we can distribute the mail as an article. If not, we inform "you are not a member" which is sent by -C<inform_reply_messages()> in C<FML::Process::Kernel>. +C<reply_message_inform()> in C<FML::Process::Kernel>. Lastly we unlock the current process. @@ -233,7 +233,7 @@ sub run # $curproc->lock(); unless ($curproc->is_refused()) { - if ($curproc->permit_post()) { + if ($curproc->is_permit_post()) { $curproc->_deliver_article_prep($args); } else { @@ -337,7 +337,7 @@ sub finish $curproc->_deliver_article(); } - $curproc->inform_reply_messages(); + $curproc->reply_message_inform(); unless ($curproc->smtp_server_state_get_error()) { $curproc->queue_flush(); } @@ -380,7 +380,7 @@ sub _deliver_article_prep # get sequence number my $id = $article->increment_id; if ($id > 0) { - $curproc->set_article_id($id); + $curproc->article_set_id($id); } else { $curproc->logerror("returned article id=$id"); @@ -585,7 +585,7 @@ sub _deliver_article my $handle = undef; # overload $sfp log function pointer. - my $wh = $curproc->open_outgoing_message_channel(); + my $wh = $curproc->outgoing_message_cache_open(); if (defined $wh) { $sfp = sub { print $wh @_;}; $handle = undef; # $wh; @@ -727,7 +727,7 @@ sub _htmlify my $index_order = $config->{ html_archive_index_order_type }; my $_tdb_args = $curproc->thread_db_args(); - $curproc->set_umask_as_public(); + $curproc->umask_set_as_public(); eval q{ use Mail::Message::ToHTML; @@ -748,7 +748,7 @@ sub _htmlify $curproc->logerror($@) if $@; } - $curproc->reset_umask(); + $curproc->umask_reset(); } diff --git a/fml/lib/FML/Process/DocViewer.pm b/fml/lib/FML/Process/DocViewer.pm index 2d3e4be4..7947603b 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,2004,2005 Ken'ichi Fukamachi # All rights reserved. # -# $FML: DocViewer.pm,v 1.33 2004/07/11 15:43:39 fukachan Exp $ +# $FML: DocViewer.pm,v 1.34 2005/05/26 10:22:58 fukachan Exp $ # package FML::Process::DocViewer; @@ -79,9 +79,9 @@ sub prepare my $eval = $config->get_hook( 'fmldoc_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - # $curproc->resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + # $curproc->ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); $eval = $config->get_hook( 'fmldoc_prepare_end_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 282d42e7..3dd110e6 100644 --- a/fml/lib/FML/Process/Error.pm +++ b/fml/lib/FML/Process/Error.pm @@ -3,7 +3,7 @@ # Copyright (C) 2002,2003,2004,2005 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Error.pm,v 1.50 2005/05/27 03:03:37 fukachan Exp $ +# $FML: Error.pm,v 1.51 2005/06/04 01:35:26 fukachan Exp $ # package FML::Process::Error; @@ -76,14 +76,14 @@ sub prepare my $eval = $config->get_hook( 'error_mail_analyzer_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - $curproc->resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + $curproc->ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); $curproc->scheduler_init(); $curproc->log_message_init(); if ($config->yes('use_error_mail_analyzer_function')) { - $curproc->parse_incoming_message(); + $curproc->incoming_message_parse(); } else { exit(0); @@ -259,7 +259,7 @@ _EOF_ =head2 finish($args) - $curproc->inform_reply_messages(); + $curproc->reply_message_inform(); =cut @@ -286,7 +286,7 @@ sub finish $curproc->logwarn("error message not found"); } - $curproc->inform_reply_messages(); + $curproc->reply_message_inform(); $curproc->queue_flush(); $eval = $config->get_hook( 'error_mail_analyzer_finish_end_hook' ); diff --git a/fml/lib/FML/Process/FetchFML.pm b/fml/lib/FML/Process/FetchFML.pm index 07590faf..869890bc 100644 --- a/fml/lib/FML/Process/FetchFML.pm +++ b/fml/lib/FML/Process/FetchFML.pm @@ -3,7 +3,7 @@ # Copyright (C) 2005 Ken'ichi Fukamachi # All rights reserved. # -# $FML$ +# $FML: FetchFML.pm,v 1.1 2005/06/03 11:00:55 fukachan Exp $ # package FML::Process::FetchFML; @@ -77,9 +77,9 @@ sub prepare my $eval = $config->get_hook( 'fetchfml_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - $curproc->resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + $curproc->ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); $curproc->scheduler_init(); $curproc->log_message_init(); $curproc->_fetchfml_prepare(); diff --git a/fml/lib/FML/Process/Flow.pm b/fml/lib/FML/Process/Flow.pm index 370e7590..0f439b3a 100644 --- a/fml/lib/FML/Process/Flow.pm +++ b/fml/lib/FML/Process/Flow.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: Flow.pm,v 1.27 2004/07/11 15:43:39 fukachan Exp $ +# $FML: Flow.pm,v 1.28 2005/05/26 12:56:35 fukachan Exp $ # package FML::Process::Flow; @@ -54,7 +54,7 @@ programs kicked by MTA, command line interfaces and CGI's. $process->finish($args); # clean up tmporary files - $process->clean_up_tmpfiles(); + $process->tmp_files_clean_up(); =cut @@ -105,8 +105,8 @@ sub ProcessStart $process->sysflow_finalize_stderr_channel($args); # clean up temporary files - $process->clean_up_tmpfiles(); - $process->clean_up_incoming_queue(); + $process->tmp_files_clean_up(); + $process->incoming_message_queue_clean_up(); # debug $process->finalize(); diff --git a/fml/lib/FML/Process/HTMLify.pm b/fml/lib/FML/Process/HTMLify.pm index bf357789..75a05794 100644 --- a/fml/lib/FML/Process/HTMLify.pm +++ b/fml/lib/FML/Process/HTMLify.pm @@ -3,7 +3,7 @@ # Copyright (C) 2001,2002,2003,2004 Ken'ichi Fukamachi # All rights reserved. # -# $FML: HTMLify.pm,v 1.35 2004/01/31 04:06:33 fukachan Exp $ +# $FML: HTMLify.pm,v 1.36 2004/04/23 04:10:37 fukachan Exp $ # package FML::Process::HTMLify; @@ -70,9 +70,9 @@ sub prepare my $eval = $config->get_hook( 'fmlhtmlify_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - $curproc->resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + $curproc->ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); $eval = $config->get_hook( 'fmlhtmlify_prepare_end_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } diff --git a/fml/lib/FML/Process/PGP.pm b/fml/lib/FML/Process/PGP.pm index 141d50f9..9f5094e3 100644 --- a/fml/lib/FML/Process/PGP.pm +++ b/fml/lib/FML/Process/PGP.pm @@ -3,7 +3,7 @@ # Copyright (C) 2005 Ken'ichi Fukamachi # All rights reserved. # -# $FML: PGP.pm,v 1.1 2005/05/30 02:24:14 fukachan Exp $ +# $FML: PGP.pm,v 1.2 2005/05/30 03:18:45 fukachan Exp $ # package FML::Process::PGP; @@ -76,9 +76,9 @@ sub prepare my $eval = $config->get_hook( 'fmlpgp_prepare_start_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } - $curproc->resolve_ml_specific_variables(); - $curproc->load_config_files(); - $curproc->fix_perl_include_path(); + $curproc->ml_variables_resolve(); + $curproc->config_files_load(); + $curproc->env_fix_perl_include_path(); $eval = $config->get_hook( 'fmlpgp_prepare_end_hook' ); if ($eval) { eval qq{ $eval; }; $curproc->logwarn($@) if $@; } diff --git a/fml/lib/FML/Process/State.pm b/fml/lib/FML/Process/State.pm index f9447391..fc23a877 100644 --- a/fml/lib/FML/Process/State.pm +++ b/fml/lib/FML/Process/State.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: State.pm,v 1.19 2005/05/30 06:52:24 fukachan Exp $ +# $FML: State.pm,v 1.20 2005/06/03 09:34:29 fukachan Exp $ # package FML::Process::State; @@ -45,7 +45,7 @@ sub current_process_ml_name_init # Arguments: OBJ($curproc) STR($ml_name) # Side Effects: update pcb. # Return Value: none -sub set_current_process_ml_name +sub current_process_set_ml_name { my ($curproc, $ml_name) = @_; my $pcb = $curproc->pcb(); @@ -58,7 +58,7 @@ sub set_current_process_ml_name # Arguments: OBJ($curproc) # Side Effects: none # Return Value: STR -sub get_current_process_ml_name +sub current_process_get_ml_name { my ($curproc) = @_; my $pcb = $curproc->pcb(); @@ -175,7 +175,7 @@ sub restriction_state_reply_reason # Arguments: OBJ($curproc) NUM($id) # Side Effects: update pcb. # Return Value: NUM -sub set_article_id +sub article_set_id { my ($curproc, $id) = @_; my $pcb = $curproc->pcb(); @@ -188,7 +188,7 @@ sub set_article_id # Arguments: OBJ($curproc) # Side Effects: none # Return Value: NUM -sub get_article_id +sub article_get_id { my ($curproc) = @_; my $pcb = $curproc->pcb(); |
