diff options
| author | fukachan <fukachan> | 2006-01-09 14:00:53 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2006-01-09 14:00:53 +0000 |
| commit | 998d6457399e07b82ee606d2cff85a3261fd6743 (patch) | |
| tree | 446fe1c910bfc9243914fb7ecc4ed0337bb37eed | |
| parent | 7e1d1a36de7bb1d42262bcf5573a52b56fe22804 (diff) | |
| download | fml8-998d6457399e07b82ee606d2cff85a3261fd6743.tar.gz fml8-998d6457399e07b82ee606d2cff85a3261fd6743.tar.bz2 fml8-998d6457399e07b82ee606d2cff85a3261fd6743.zip | |
white space cosmetics.
fix copyright.
38 files changed, 645 insertions, 645 deletions
diff --git a/fml/lib/FML/Article/Thread.pm b/fml/lib/FML/Article/Thread.pm index c409b3c3..ee614b2c 100644 --- a/fml/lib/FML/Article/Thread.pm +++ b/fml/lib/FML/Article/Thread.pm @@ -1,9 +1,9 @@ #-*- perl -*- # -# Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Thread.pm,v 1.17 2005/09/06 12:20:39 fukachan Exp $ +# $FML: Thread.pm,v 1.18 2005/09/17 01:33:04 fukachan Exp $ # package FML::Article::Thread; @@ -246,7 +246,7 @@ sub check_thread_status my $thread = $self->{ _thread_object }; my $article = $self->{ _article_object }; - # check the current thread status + # check the current thread status # XXX for thread, not each member ! my $status = $thread->get_thread_status($head_id); if ($status eq $state_closed || $status eq $state_auto_closed) { @@ -376,7 +376,7 @@ article $id. =cut -# Descriptions: return a bulk of brief summary. +# Descriptions: return a bulk of brief summary. # Arguments: OBJ($self) NUM($id) HASH_REF($thread_args) # Side Effects: none # Return Value: none @@ -413,7 +413,7 @@ pritn one line summary of message body. =head2 print_summary($thread_args) -pritn both header and body summary. +pritn both header and body summary. =cut @@ -539,7 +539,7 @@ sub _generate_summary $buf = $msg->$fp(); # cache on. - if ($buf && $fp eq 'one_line_summary') { + if ($buf && $fp eq 'one_line_summary') { $thread->set_article_summary($id, $buf); } } @@ -791,7 +791,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/CGI/Skin/Wizard.pm b/fml/lib/FML/CGI/Skin/Wizard.pm index 9cb46bdd..f2335b63 100644 --- a/fml/lib/FML/CGI/Skin/Wizard.pm +++ b/fml/lib/FML/CGI/Skin/Wizard.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2003,2004 Ken'ichi Fukamachi +# Copyright (C) 2003,2004,2006 Ken'ichi Fukamachi # 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.12 2004/07/23 13:16:33 fukachan Exp $ +# $FML: Wizard.pm,v 1.1 2004/10/09 12:06:46 fukachan Exp $ # package FML::CGI::Skin::Wizard; @@ -117,7 +117,7 @@ sub run_cgi_menu # 2. list up command. my $next_button = $curproc->message_nl("cgi.button_next", "next"); print "<P>\n"; - print $curproc->message_nl("cgi.select_command", + print $curproc->message_nl("cgi.select_command", "2. select command."); print "\n<BR>\n"; @@ -181,7 +181,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 Ken'ichi Fukamachi +Copyright (C) 2004,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Command/Admin/mailq.pm b/fml/lib/FML/Command/Admin/mailq.pm index c4e1af29..3f23e09b 100644 --- a/fml/lib/FML/Command/Admin/mailq.pm +++ b/fml/lib/FML/Command/Admin/mailq.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2003,2004 Ken'ichi Fukamachi +# Copyright (C) 2003,2004,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: mailq.pm,v 1.10 2004/09/03 12:43:55 fukachan Exp $ +# $FML: mailq.pm,v 1.11 2004/09/04 03:13:16 fukachan Exp $ # package FML::Command::Admin::mailq; @@ -91,7 +91,7 @@ sub _list_up_queue if ($q->is_valid_queue()) { # 1. the first line is "queue-id sender". printf $format, $qid, $info->{sender}; - + # 2. list up recipients after 2nd lines. my $rq = $info->{ recipients }; for my $r (@$rq) { @@ -122,7 +122,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2003,2004 Ken'ichi Fukamachi +Copyright (C) 2003,2004,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Command/Admin/mergeml.pm b/fml/lib/FML/Command/Admin/mergeml.pm index fc9711fe..ce67aacc 100644 --- a/fml/lib/FML/Command/Admin/mergeml.pm +++ b/fml/lib/FML/Command/Admin/mergeml.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 Ken'ichi Fukamachi +# Copyright (C) 2004,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: mergeml.pm,v 1.5 2004/11/24 12:24:32 fukachan Exp $ +# $FML: mergeml.pm,v 1.6 2004/11/25 12:07:40 fukachan Exp $ # package FML::Command::Admin::mergeml; @@ -111,7 +111,7 @@ sub process # Descriptions: merge ML configurations. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # OBJ($curproc) HASH_REF($command_args) HASH_REF($params) # Side Effects: none # Return Value: none @@ -174,7 +174,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 Ken'ichi Fukamachi +Copyright (C) 2004,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Command/Admin/reviveml.pm b/fml/lib/FML/Command/Admin/reviveml.pm index d899050e..a526613c 100644 --- a/fml/lib/FML/Command/Admin/reviveml.pm +++ b/fml/lib/FML/Command/Admin/reviveml.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2005 Ken'ichi Fukamachi +# Copyright (C) 2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML$ +# $FML: reviveml.pm,v 1.1 2005/08/23 09:32:58 fukachan Exp $ # package FML::Command::Admin::reviveml; @@ -53,7 +53,7 @@ sub process my $ml_domain = $curproc->ml_domain(); my $ml_home_dir = $curproc->ml_home_dir($ml_name, $ml_domain); - my $ml_home_dir_prev = + my $ml_home_dir_prev = $curproc->ml_home_dir_find_latest_removed_path($ml_name, $ml_domain); $curproc->logdebug("ml_name=$ml_name ml_domain=$ml_domain"); @@ -82,7 +82,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2005 Ken'ichi Fukamachi +Copyright (C) 2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Command/Message.pm b/fml/lib/FML/Command/Message.pm index b4d7f946..32bff683 100644 --- a/fml/lib/FML/Command/Message.pm +++ b/fml/lib/FML/Command/Message.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$ +# $FML: Message.pm,v 1.1 2006/01/07 14:43:25 fukachan Exp $ # package FML::Command::Message; @@ -46,10 +46,10 @@ sub new send back confirmation message. -1. if $XXX_command_auth_type == confirmation, +1. if $XXX_command_auth_type == confirmation, 1.1 send back confirmation to address (From:). - -2. if $XXX_command_auth_type == manual, + +2. if $XXX_command_auth_type == manual, 2.1 notify "forwarded request to maintainer(s)." to sender. 2.2 notify request to maintainer(s). @@ -57,7 +57,7 @@ send back confirmation message. # Descriptions: send back confirmation message. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) # OBJ($confirm) HASH_REF($sc_args) # Side Effects: messages sent. # Return Value: none @@ -88,15 +88,15 @@ sub send_confirmation # So, fml8 do nothing. elsif ($mode eq 'manual') { my $msg = $curproc->incoming_message(); - my $maintainer = $config->{ maintainer }; - my $_rm_args = { + my $maintainer = $config->{ maintainer }; + my $_rm_args = { recipient => $maintainer, _arg_command => $command, }; my $default = "send back the following confirmation."; # 2.1 notify "forwarded request to maintainer(s)." to sender. - $curproc->reply_message_nl('command.forward_request_to_admin', + $curproc->reply_message_nl('command.forward_request_to_admin', "", $rm_args); @@ -104,9 +104,9 @@ sub send_confirmation $curproc->reply_message_nl('command.receive_request', "", $_rm_args); $curproc->reply_message_nl('command.confirm', $default, $_rm_args); $curproc->reply_message("\n$id\n", $_rm_args); - $curproc->reply_message($msg, $_rm_args); + $curproc->reply_message($msg, $_rm_args); } - # 3. fatal error if neither of automatic nor manual. + # 3. fatal error if neither of automatic nor manual. else { $curproc->logerror("unknown operation mode"); croak("unknown operation mode"); diff --git a/fml/lib/FML/Command/User/chaddr.pm b/fml/lib/FML/Command/User/chaddr.pm index 4e9081d4..8addc54e 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.35 2006/01/07 14:43:25 fukachan Exp $ +# $FML: chaddr.pm,v 1.36 2006/01/08 03:06:59 fukachan Exp $ # package FML::Command::User::chaddr; @@ -189,7 +189,7 @@ sub process use FML::Command::Message; my $_msg = new FML::Command::Message; - my $sc_args = { + my $sc_args = { command => "chaddr", rm_args => $optargs, }; diff --git a/fml/lib/FML/Command/User/confirm.pm b/fml/lib/FML/Command/User/confirm.pm index a066f4e6..ea0d1e12 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.36 2006/01/07 15:28:03 fukachan Exp $ +# $FML: confirm.pm,v 1.37 2006/01/08 03:06:59 fukachan Exp $ # package FML::Command::User::confirm; @@ -123,10 +123,10 @@ sub process my $found = ''; if ($found = $confirm->find($id)) { # if request is found unless ($confirm->is_expired($id, $expire_limit)) { - $self->_switch_process($confirm, + $self->_switch_process($confirm, $class, - $id, - $curproc, + $id, + $curproc, $command_args); } else { # if requset is expired @@ -156,7 +156,7 @@ sub process sub _switch_process { my ($self, $confirm, $class, $id, $curproc, $command_args) = @_; - my $config = $curproc->config(); + my $config = $curproc->config(); my $command = $class; my $varname = "${command}_command_operation_mode"; my $mode = $config->{ $varname } || 'confirmation'; @@ -213,7 +213,7 @@ sub _switch_command $class eq 'unsubscribe' || $class eq 'chaddr' || $class eq 'on' || - $class eq 'off' || + $class eq 'off' || $class eq 'moderate') { $command_args->{ command_data } = $address; $command_args->{ command_mode } = 'Admin'; @@ -286,7 +286,7 @@ sub _forward_request # 2.2 notify request to maintainer(s). $curproc->reply_message_nl($key2, $default2, $rm_args); - $curproc->reply_message($msg, $rm_args); + $curproc->reply_message($msg, $rm_args); } diff --git a/fml/lib/FML/Config.pm b/fml/lib/FML/Config.pm index 9ed61445..7864eec2 100644 --- a/fml/lib/FML/Config.pm +++ b/fml/lib/FML/Config.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Config.pm,v 1.99 2005/05/26 09:36:45 fukachan Exp $ +# $FML: Config.pm,v 1.100 2005/08/20 01:27:31 fukachan Exp $ # package FML::Config; @@ -550,7 +550,7 @@ sub read # Descriptions: merge the specified hash values into $file. -# Arguments: OBJ($self) STR($file) HASH_REF($hash_ref) +# Arguments: OBJ($self) STR($file) HASH_REF($hash_ref) # Side Effects: none # Return Value: none sub merge_into_file @@ -972,7 +972,7 @@ Specify all at mode to dump all variables. $cfargs = { mode => all }; -Specify get_diff_as_hash_ref at mode to show +Specify get_diff_as_hash_ref at mode to show only variables differed from the original one. $cfargs = { mode => get_diff_as_hash_ref }; @@ -1324,7 +1324,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Config/Menu.pm b/fml/lib/FML/Config/Menu.pm index 00a0a31a..98581881 100644 --- a/fml/lib/FML/Config/Menu.pm +++ b/fml/lib/FML/Config/Menu.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2004,2005,2006 Ken'ichi Fukamachi # 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.6 2005/08/10 12:55:32 fukachan Exp $ +# $FML: Menu.pm,v 1.7 2005/08/20 01:27:32 fukachan Exp $ # package FML::Config::Menu; @@ -139,7 +139,7 @@ sub run_cui if ($output) { $self->{ _output } = $output; - + print STDERR "*** DIFF (debug) ***\n"; print STDERR $output, "\n"; print STDERR "*** DIFF END ***\n"; @@ -329,7 +329,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004,2005 Ken'ichi Fukamachi +Copyright (C) 2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Confirm.pm b/fml/lib/FML/Confirm.pm index e157828f..fb851940 100644 --- a/fml/lib/FML/Confirm.pm +++ b/fml/lib/FML/Confirm.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # 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.18 2005/05/27 03:03:31 fukachan Exp $ +# $FML: Confirm.pm,v 1.19 2005/12/18 12:34:25 fukachan Exp $ # package FML::Confirm; @@ -115,7 +115,7 @@ sub assign_id # 2. save the time map: { MD5 => ASSIGNED_UNIX_TIME } $self->store_id( $md5sum ); - # 3. internal later use. + # 3. internal later use. $self->{ _cur_id } = $md5sum; return $id; @@ -129,7 +129,7 @@ sub assign_id sub id { my ($self) = @_; - return( $self->{ _cur_id } || undef ); + return( $self->{ _cur_id } || undef ); } @@ -371,7 +371,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Credential.pm b/fml/lib/FML/Credential.pm index 19571dad..b014a8b5 100644 --- a/fml/lib/FML/Credential.pm +++ b/fml/lib/FML/Credential.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # 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.65 2005/12/11 13:10:25 fukachan Exp $ +# $FML: Credential.pm,v 1.66 2005/12/19 11:29:26 fukachan Exp $ # package FML::Credential; @@ -70,7 +70,7 @@ sub new my ($type) = ref($self) || $self; my $me = \%Credential; my $config = $curproc->config(); - my $level = + my $level = $config->{ address_compare_function_domain_matching_level } || 3; # default comparison level @@ -441,7 +441,7 @@ sub has_address_in_map # $curproc->lock($lock_channel); # READER LOCK my $_user = quotemeta($user); - my $addrs = $obj->find($_user , + my $addrs = $obj->find($_user , { want => 'key', all => 1, hints => [ $address ] }); # $curproc->unlock($lock_channel); # READER LOCK @@ -730,7 +730,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/ML/Control.pm b/fml/lib/FML/ML/Control.pm index 77b99ea2..8c5170d0 100644 --- a/fml/lib/FML/ML/Control.pm +++ b/fml/lib/FML/ML/Control.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Control.pm,v 1.9 2005/08/17 12:08:46 fukachan Exp $ +# $FML: Control.pm,v 1.10 2005/08/18 10:23:09 fukachan Exp $ # package FML::ML::Control; @@ -71,7 +71,7 @@ sub adjust_params_for_virtual_domain # post is exceptional. $ml_name_post = sprintf("%s",$ml_name, $ml_domain); - # + # $is_default_domain = 1; } else { @@ -84,7 +84,7 @@ sub adjust_params_for_virtual_domain # post is exceptional. $ml_name_post = sprintf("%s=%s",$ml_name, $ml_domain); - # + # $is_default_domain = 0; } @@ -568,7 +568,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/MTA/Control/Postfix.pm b/fml/lib/FML/MTA/Control/Postfix.pm index 0705390a..fdb70198 100644 --- a/fml/lib/FML/MTA/Control/Postfix.pm +++ b/fml/lib/FML/MTA/Control/Postfix.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2002,2003,2004,2005,2006 Ken'ichi Fukamachi # 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.8 2005/08/17 10:44:47 fukachan Exp $ +# $FML: Postfix.pm,v 1.9 2005/08/18 10:20:57 fukachan Exp $ # package FML::MTA::Control::Postfix; @@ -256,7 +256,7 @@ sub postfix_get_aliases_as_hash_ref for my $map (@$maps) { $curproc->ui_message("scan key = $key, map = $map") if $debug; - # XXX this map has no prefix such as file:, hash:, dbm:, ... + # XXX this map has no prefix such as file:, hash:, dbm:, ... if ($map =~ /^\w+:/) { $curproc->ui_message("* ignored $map"); next MAP; @@ -457,7 +457,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/MUA/POP3.pm b/fml/lib/FML/MUA/POP3.pm index d5b63d43..e51c5745 100644 --- a/fml/lib/FML/MUA/POP3.pm +++ b/fml/lib/FML/MUA/POP3.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2005 Ken'ichi Fukamachi +# Copyright (C) 2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: POP3.pm,v 1.5 2005/08/23 13:16:20 fukachan Exp $ +# $FML: POP3.pm,v 1.6 2005/12/18 12:03:52 fukachan Exp $ # package FML::MUA::POP3; @@ -14,7 +14,7 @@ use Carp; use FileHandle; # optional queue class. -my $opt_class = [ "article_post", "command_mail", "error_mail_analyzer" ]; +my $opt_class = [ "article_post", "command_mail", "error_mail_analyzer" ]; =head1 NAME @@ -173,7 +173,7 @@ sub _new_queue_file { my ($self, $r_args) = @_; my $curproc = $self->{ _curproc }; - my $config = $curproc->config(); + my $config = $curproc->config(); my $queue_dir = $config->{ fetchfml_queue_dir }; my $class = $r_args->{ class } || undef; @@ -199,7 +199,7 @@ sub pickup_queue my $queue_dir = $config->{ fetchfml_queue_dir }; use Mail::Delivery::Queue; - my $queue = new Mail::Delivery::Queue { + my $queue = new Mail::Delivery::Queue { directory => $queue_dir, local_class => $opt_class, }; @@ -332,7 +332,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2005 Ken'ichi Fukamachi +Copyright (C) 2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Merge/FML4/Rules.pm b/fml/lib/FML/Merge/FML4/Rules.pm index d6f2575f..3d5ea5d5 100644 --- a/fml/lib/FML/Merge/FML4/Rules.pm +++ b/fml/lib/FML/Merge/FML4/Rules.pm @@ -8,7 +8,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$ +# $FML: Rules.pm,v 1.9 2006/01/04 07:48:01 fukachan Exp $ # package FML::Merge::FML4::Rules; @@ -37,7 +37,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'debug' && $diff->{ debug })) { @@ -46,7 +46,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'debug' && $diff->{ debug })) { @@ -55,7 +55,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LANGUAGE' && $diff->{ LANGUAGE })) { @@ -64,7 +64,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LANGUAGE' && $diff->{ LANGUAGE })) { @@ -73,7 +73,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MESSAGE_LANGUAGE' && $diff->{ MESSAGE_LANGUAGE })) { @@ -82,7 +82,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MESSAGE_LANGUAGE' && $diff->{ MESSAGE_LANGUAGE })) { @@ -91,7 +91,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DOMAINNAME' && $diff->{ DOMAINNAME })) { @@ -100,7 +100,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FQDN' && $diff->{ FQDN })) { @@ -109,7 +109,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAIL_LIST' && $diff->{ MAIL_LIST })) { @@ -118,7 +118,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM })) { @@ -127,7 +127,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM }) || ($key eq 'REJECT_POST_HANDLER' && $diff->{ REJECT_POST_HANDLER })) { @@ -138,7 +138,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM }) || ($key eq 'REJECT_POST_HANDLER' && $diff->{ REJECT_POST_HANDLER })) { @@ -149,7 +149,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM }) || ($key eq 'REJECT_POST_HANDLER' && $diff->{ REJECT_POST_HANDLER })) { @@ -160,7 +160,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM }) || ($key eq 'MODERATOR_FORWARD_TYPE' && $diff->{ MODERATOR_FORWARD_TYPE })) { @@ -171,7 +171,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM }) || ($key eq 'MODERATOR_FORWARD_TYPE' && $diff->{ MODERATOR_FORWARD_TYPE })) { @@ -182,7 +182,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_POST_FROM' && $diff->{ PERMIT_POST_FROM }) || ($key eq 'MODERATOR_FORWARD_TYPE' && $diff->{ MODERATOR_FORWARD_TYPE })) { @@ -193,7 +193,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONTROL_ADDRESS' && $diff->{ CONTROL_ADDRESS })) { @@ -202,7 +202,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_COMMAND_FROM' && $diff->{ PERMIT_COMMAND_FROM })) { @@ -211,7 +211,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_COMMAND_FROM' && $diff->{ PERMIT_COMMAND_FROM }) || ($key eq 'REJECT_COMMAND_HANDLER' && $diff->{ REJECT_COMMAND_HANDLER })) { @@ -222,7 +222,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_COMMAND_FROM' && $diff->{ PERMIT_COMMAND_FROM }) || ($key eq 'REJECT_COMMAND_HANDLER' && $diff->{ REJECT_COMMAND_HANDLER })) { @@ -233,7 +233,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_COMMAND_FROM' && $diff->{ PERMIT_COMMAND_FROM }) || ($key eq 'REJECT_COMMAND_HANDLER' && $diff->{ REJECT_COMMAND_HANDLER })) { @@ -244,7 +244,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PERMIT_COMMAND_FROM' && $diff->{ PERMIT_COMMAND_FROM })) { @@ -253,7 +253,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAIL_LIST_ACCEPT_COMMAND' && $diff->{ MAIL_LIST_ACCEPT_COMMAND })) { @@ -262,7 +262,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAINTAINER' && $diff->{ MAINTAINER })) { @@ -271,7 +271,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAINTAINER_SIGNATURE' && $diff->{ MAINTAINER_SIGNATURE })) { @@ -280,7 +280,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ML_FN' && $diff->{ ML_FN })) { @@ -289,7 +289,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SPOOL_DIR' && $diff->{ SPOOL_DIR })) { @@ -298,7 +298,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TMP_DIR' && $diff->{ TMP_DIR })) { @@ -307,7 +307,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'VAR_DIR' && $diff->{ VAR_DIR })) { @@ -316,7 +316,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'VARLOG_DIR' && $diff->{ VARLOG_DIR })) { @@ -325,7 +325,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'VARRUN_DIR' && $diff->{ VARRUN_DIR })) { @@ -334,7 +334,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'VARDB_DIR' && $diff->{ VARDB_DIR })) { @@ -343,7 +343,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MANUAL_REGISTRATION_TYPE' && $diff->{ MANUAL_REGISTRATION_TYPE })) { @@ -352,7 +352,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MANUAL_REGISTRATION_TYPE' && $diff->{ MANUAL_REGISTRATION_TYPE })) { @@ -361,7 +361,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MANUAL_REGISTRATION_CONFIRMATION_FILE' && $diff->{ MANUAL_REGISTRATION_CONFIRMATION_FILE })) { @@ -370,7 +370,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_TYPE' && $diff->{ AUTO_REGISTRATION_TYPE })) { @@ -379,7 +379,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_TYPE' && $diff->{ AUTO_REGISTRATION_TYPE })) { @@ -388,7 +388,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_TYPE' && $diff->{ AUTO_REGISTRATION_TYPE })) { @@ -397,7 +397,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_TYPE' && $diff->{ AUTO_REGISTRATION_TYPE })) { @@ -406,7 +406,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_KEYWORD' && $diff->{ AUTO_REGISTRATION_KEYWORD })) { @@ -415,7 +415,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_KEYWORD' && $diff->{ AUTO_REGISTRATION_KEYWORD })) { @@ -424,7 +424,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_DEFAULT_MODE' && $diff->{ AUTO_REGISTRATION_DEFAULT_MODE })) { @@ -433,7 +433,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_ADDRESS' && $diff->{ CONFIRMATION_ADDRESS })) { @@ -442,7 +442,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_ADDRESS' && $diff->{ CONFIRMATION_ADDRESS })) { @@ -451,7 +451,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_SUBSCRIBE' && $diff->{ CONFIRMATION_SUBSCRIBE })) { @@ -460,7 +460,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_SUBSCRIBE' && $diff->{ CONFIRMATION_SUBSCRIBE })) { @@ -469,7 +469,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_KEYWORD' && $diff->{ CONFIRMATION_KEYWORD })) { @@ -478,7 +478,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_KEYWORD' && $diff->{ CONFIRMATION_KEYWORD })) { @@ -487,7 +487,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_WELCOME_STATEMENT' && $diff->{ CONFIRMATION_WELCOME_STATEMENT })) { @@ -496,7 +496,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_SUBSCRIBE_NEED_YOUR_NAME' && $diff->{ CONFIRMATION_SUBSCRIBE_NEED_YOUR_NAME })) { @@ -505,7 +505,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_FILE' && $diff->{ CONFIRMATION_FILE })) { @@ -514,7 +514,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_EXPIRE' && $diff->{ CONFIRMATION_EXPIRE })) { @@ -523,7 +523,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMATION_LIST' && $diff->{ CONFIRMATION_LIST })) { @@ -532,7 +532,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_SUBSCRIBE' && $diff->{ DEFAULT_SUBSCRIBE })) { @@ -541,7 +541,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_SUBSCRIBE' && $diff->{ DEFAULT_SUBSCRIBE })) { @@ -550,7 +550,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WELCOME_FILE' && $diff->{ WELCOME_FILE })) { @@ -559,7 +559,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WELCOME_STATEMENT' && $diff->{ WELCOME_STATEMENT })) { @@ -568,7 +568,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILE_TO_REGIST' && $diff->{ FILE_TO_REGIST })) { @@ -577,7 +577,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTERED_UNDELIVER_P' && $diff->{ AUTO_REGISTERED_UNDELIVER_P })) { @@ -586,7 +586,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTERED_UNDELIVER_P' && $diff->{ AUTO_REGISTERED_UNDELIVER_P })) { @@ -595,7 +595,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTERD_UNDELIVER_P' && $diff->{ AUTO_REGISTERD_UNDELIVER_P })) { @@ -604,7 +604,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_LINES_LIMIT' && $diff->{ AUTO_REGISTRATION_LINES_LIMIT })) { @@ -613,7 +613,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_REGISTRATION_LINES_LIMIT' && $diff->{ AUTO_REGISTRATION_LINES_LIMIT })) { @@ -622,7 +622,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMD_ACK_REQ_FILE' && $diff->{ CONFIRMD_ACK_REQ_FILE })) { @@ -631,7 +631,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMD_ACK_LOGFILE' && $diff->{ CONFIRMD_ACK_LOGFILE })) { @@ -640,7 +640,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMD_ACK_EXPIRE_UNIT' && $diff->{ CONFIRMD_ACK_EXPIRE_UNIT })) { @@ -649,7 +649,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONFIRMD_ACK_WAIT_UNIT' && $diff->{ CONFIRMD_ACK_WAIT_UNIT })) { @@ -658,7 +658,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION' && $diff->{ REMOTE_ADMINISTRATION })) { @@ -667,7 +667,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION' && $diff->{ REMOTE_ADMINISTRATION })) { @@ -676,7 +676,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_REQUIRE_PASSWORD' && $diff->{ REMOTE_ADMINISTRATION_REQUIRE_PASSWORD })) { @@ -685,7 +685,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -694,7 +694,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -703,7 +703,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -712,7 +712,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -721,7 +721,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -730,7 +730,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -739,7 +739,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REMOTE_ADMINISTRATION_AUTH_TYPE' && $diff->{ REMOTE_ADMINISTRATION_AUTH_TYPE })) { @@ -748,7 +748,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_MEMBER_LIST' && $diff->{ ADMIN_MEMBER_LIST })) { @@ -757,7 +757,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_HELP_FILE' && $diff->{ ADMIN_HELP_FILE })) { @@ -766,7 +766,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PASSWD_FILE' && $diff->{ PASSWD_FILE })) { @@ -775,7 +775,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_ADD_SEND_WELCOME_FILE' && $diff->{ ADMIN_ADD_SEND_WELCOME_FILE })) { @@ -784,7 +784,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_ADD_SEND_WELCOME_FILE' && $diff->{ ADMIN_ADD_SEND_WELCOME_FILE })) { @@ -793,7 +793,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_LOG_DEFAULT_LINE_LIMIT' && $diff->{ ADMIN_LOG_DEFAULT_LINE_LIMIT })) { @@ -802,7 +802,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGP_PATH' && $diff->{ PGP_PATH })) { @@ -811,7 +811,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_FML40_PGP_PATH' && $diff->{ USE_FML40_PGP_PATH })) { @@ -820,7 +820,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DIST_AUTH_KEYRING_DIR' && $diff->{ DIST_AUTH_KEYRING_DIR })) { @@ -829,7 +829,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DIST_ENCRYPT_KEYRING_DIR' && $diff->{ DIST_ENCRYPT_KEYRING_DIR })) { @@ -838,7 +838,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_AUTH_KEYRING_DIR' && $diff->{ ADMIN_AUTH_KEYRING_DIR })) { @@ -847,7 +847,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_ENCRYPT_KEYRING_DIR' && $diff->{ ADMIN_ENCRYPT_KEYRING_DIR })) { @@ -856,7 +856,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MODERATOR_MEMBER_LIST' && $diff->{ MODERATOR_MEMBER_LIST })) { @@ -865,7 +865,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MODERATOR_EXPIRE_LIMIT' && $diff->{ MODERATOR_EXPIRE_LIMIT })) { @@ -874,7 +874,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REJECT_ADDR' && $diff->{ REJECT_ADDR })) { @@ -883,7 +883,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REJECT_ADDR_LIST' && $diff->{ REJECT_ADDR_LIST })) { @@ -892,7 +892,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_UNIX_FROM_LOOP_CHECK' && $diff->{ NOT_USE_UNIX_FROM_LOOP_CHECK })) { @@ -901,7 +901,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_UNIX_FROM_LOOP_CHECK' && $diff->{ NOT_USE_UNIX_FROM_LOOP_CHECK })) { @@ -910,7 +910,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHECK_MESSAGE_ID' && $diff->{ CHECK_MESSAGE_ID })) { @@ -919,7 +919,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHECK_MESSAGE_ID' && $diff->{ CHECK_MESSAGE_ID })) { @@ -928,7 +928,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHECK_MAILBODY_CKSUM' && $diff->{ CHECK_MAILBODY_CKSUM })) { @@ -937,7 +937,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_CONNECTION' && $diff->{ LOG_CONNECTION })) { @@ -946,7 +946,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADDR_CHECK_MAX' && $diff->{ ADDR_CHECK_MAX })) { @@ -955,7 +955,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADDR_CHECK_MAX' && $diff->{ ADDR_CHECK_MAX })) { @@ -964,7 +964,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'INCOMING_MAIL_SIZE_LIMIT' && $diff->{ INCOMING_MAIL_SIZE_LIMIT })) { @@ -973,7 +973,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'INCOMING_MAIL_SIZE_LIMIT' && $diff->{ INCOMING_MAIL_SIZE_LIMIT })) { @@ -982,7 +982,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOTIFY_MAIL_SIZE_OVERFLOW' && $diff->{ NOTIFY_MAIL_SIZE_OVERFLOW })) { @@ -991,7 +991,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOTIFY_MAIL_SIZE_OVERFLOW' && $diff->{ NOTIFY_MAIL_SIZE_OVERFLOW })) { @@ -1000,7 +1000,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ANNOUNCE_MAIL_SIZE_OVERFLOW' && $diff->{ ANNOUNCE_MAIL_SIZE_OVERFLOW })) { @@ -1009,7 +1009,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ANNOUNCE_MAIL_SIZE_OVERFLOW' && $diff->{ ANNOUNCE_MAIL_SIZE_OVERFLOW })) { @@ -1018,7 +1018,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAX_MEMBER_LIMIT' && $diff->{ MAX_MEMBER_LIMIT })) { @@ -1027,7 +1027,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_DISTRIBUTE_FILTER' && $diff->{ USE_DISTRIBUTE_FILTER })) { @@ -1036,7 +1036,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_DISTRIBUTE_FILTER' && $diff->{ USE_DISTRIBUTE_FILTER })) { @@ -1045,7 +1045,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DISTRIBUTE_FILTER_HOOK' && $diff->{ DISTRIBUTE_FILTER_HOOK })) { @@ -1054,7 +1054,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_NOTIFY_REJECTION' && $diff->{ FILTER_NOTIFY_REJECTION })) { @@ -1063,7 +1063,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_NOTIFY_REJECTION' && $diff->{ FILTER_NOTIFY_REJECTION })) { @@ -1072,7 +1072,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_NULL_BODY' && $diff->{ FILTER_ATTR_REJECT_NULL_BODY })) { @@ -1081,7 +1081,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_NULL_BODY' && $diff->{ FILTER_ATTR_REJECT_NULL_BODY })) { @@ -1090,7 +1090,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_COMMAND' && $diff->{ FILTER_ATTR_REJECT_COMMAND })) { @@ -1099,7 +1099,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_COMMAND' && $diff->{ FILTER_ATTR_REJECT_COMMAND })) { @@ -1108,7 +1108,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_2BYTES_COMMAND' && $diff->{ FILTER_ATTR_REJECT_2BYTES_COMMAND })) { @@ -1117,7 +1117,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_2BYTES_COMMAND' && $diff->{ FILTER_ATTR_REJECT_2BYTES_COMMAND })) { @@ -1126,7 +1126,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_INVALID_COMMAND' && $diff->{ FILTER_ATTR_REJECT_INVALID_COMMAND })) { @@ -1135,7 +1135,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_INVALID_COMMAND' && $diff->{ FILTER_ATTR_REJECT_INVALID_COMMAND })) { @@ -1144,7 +1144,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_ONE_LINE_BODY' && $diff->{ FILTER_ATTR_REJECT_ONE_LINE_BODY })) { @@ -1153,7 +1153,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_ONE_LINE_BODY' && $diff->{ FILTER_ATTR_REJECT_ONE_LINE_BODY })) { @@ -1162,7 +1162,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_MS_GUID' && $diff->{ FILTER_ATTR_REJECT_MS_GUID })) { @@ -1171,7 +1171,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_MS_GUID' && $diff->{ FILTER_ATTR_REJECT_MS_GUID })) { @@ -1180,7 +1180,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_INVALID_JAPANESE' && $diff->{ FILTER_ATTR_REJECT_INVALID_JAPANESE })) { @@ -1189,7 +1189,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FILTER_ATTR_REJECT_INVALID_JAPANESE' && $diff->{ FILTER_ATTR_REJECT_INVALID_JAPANESE })) { @@ -1198,7 +1198,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONTENT_HANDLER_CUTOFF_EMPTY_MESSAGE' && $diff->{ CONTENT_HANDLER_CUTOFF_EMPTY_MESSAGE })) { @@ -1207,7 +1207,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CONTENT_HANDLER_REJECT_EMPTY_MESSAGE' && $diff->{ CONTENT_HANDLER_REJECT_EMPTY_MESSAGE })) { @@ -1216,7 +1216,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_HANKAKU_CONVERTER' && $diff->{ USE_HANKAKU_CONVERTER })) { @@ -1225,7 +1225,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_HANKAKU_CONVERTER' && $diff->{ USE_HANKAKU_CONVERTER })) { @@ -1234,7 +1234,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_MAIL_DEFAULT_HANDLER' && $diff->{ HTML_MAIL_DEFAULT_HANDLER })) { @@ -1243,7 +1243,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_MTI' && $diff->{ USE_MTI })) { @@ -1252,7 +1252,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_WARN_INTERVAL' && $diff->{ MTI_WARN_INTERVAL })) { @@ -1261,7 +1261,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_WARN_LASTLOG' && $diff->{ MTI_WARN_LASTLOG })) { @@ -1270,7 +1270,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_EXPIRE_UNIT' && $diff->{ MTI_EXPIRE_UNIT }) || ($key eq 'MTI_BURST_SOFT_LIMIT' && $diff->{ MTI_BURST_SOFT_LIMIT })) { @@ -1281,7 +1281,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_BURST_HARD_LIMIT' && $diff->{ MTI_BURST_HARD_LIMIT })) { @@ -1290,7 +1290,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_COST_EVAL_FUNCTION' && $diff->{ MTI_COST_EVAL_FUNCTION })) { @@ -1299,7 +1299,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MTI_MAIL_FROM_HINT_LIST' && $diff->{ MTI_MAIL_FROM_HINT_LIST })) { @@ -1308,7 +1308,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBSCRIBE_ANNOUNCE_FORWARD_TYPE' && $diff->{ SUBSCRIBE_ANNOUNCE_FORWARD_TYPE })) { @@ -1317,7 +1317,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBSCRIBE_ANNOUNCE_FORWARD_TYPE' && $diff->{ SUBSCRIBE_ANNOUNCE_FORWARD_TYPE })) { @@ -1326,7 +1326,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'UNSUBSCRIBE_AUTH_TYPE' && $diff->{ UNSUBSCRIBE_AUTH_TYPE })) { @@ -1335,7 +1335,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'UNSUBSCRIBE_AUTH_TYPE' && $diff->{ UNSUBSCRIBE_AUTH_TYPE })) { @@ -1344,7 +1344,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHADDR_AUTH_TYPE' && $diff->{ CHADDR_AUTH_TYPE })) { @@ -1353,7 +1353,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHADDR_AUTH_TYPE' && $diff->{ CHADDR_AUTH_TYPE })) { @@ -1362,7 +1362,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_LOG_MAIL' && $diff->{ USE_LOG_MAIL })) { @@ -1371,7 +1371,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_LOG_MAIL' && $diff->{ USE_LOG_MAIL })) { @@ -1380,7 +1380,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MAIL_DIR' && $diff->{ LOG_MAIL_DIR })) { @@ -1389,7 +1389,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MAIL_SEQ' && $diff->{ LOG_MAIL_SEQ })) { @@ -1398,7 +1398,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NUM_LOG_MAIL' && $diff->{ NUM_LOG_MAIL })) { @@ -1407,7 +1407,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MAIL_FILE_SIZE_MAX' && $diff->{ LOG_MAIL_FILE_SIZE_MAX })) { @@ -1416,7 +1416,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ENCRYPTED_DISTRIBUTION' && $diff->{ USE_ENCRYPTED_DISTRIBUTION })) { @@ -1425,7 +1425,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ENCRYPTED_DISTRIBUTION_TYPE' && $diff->{ ENCRYPTED_DISTRIBUTION_TYPE })) { @@ -1434,7 +1434,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATE_TYPE' && $diff->{ DATE_TYPE })) { @@ -1443,7 +1443,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATE_TYPE' && $diff->{ DATE_TYPE })) { @@ -1452,7 +1452,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'XMLNAME' && $diff->{ XMLNAME })) { @@ -1461,7 +1461,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'XMLCOUNT' && $diff->{ XMLCOUNT })) { @@ -1470,7 +1470,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'XMLCOUNT' && $diff->{ XMLCOUNT })) { @@ -1479,7 +1479,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_TAG_TYPE' && $diff->{ SUBJECT_TAG_TYPE })) { @@ -1488,7 +1488,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BRACKET' && $diff->{ BRACKET })) { @@ -1497,7 +1497,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'STRIP_BRACKETS' && $diff->{ STRIP_BRACKETS })) { @@ -1506,7 +1506,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BRACKET_SEPARATOR' && $diff->{ BRACKET_SEPARATOR })) { @@ -1515,7 +1515,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_FREE_FORM' && $diff->{ SUBJECT_FREE_FORM })) { @@ -1524,7 +1524,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_FREE_FORM_REGEXP' && $diff->{ SUBJECT_FREE_FORM_REGEXP })) { @@ -1533,7 +1533,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_FORM_LONG_ID' && $diff->{ SUBJECT_FORM_LONG_ID })) { @@ -1542,7 +1542,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ERRORS_TO' && $diff->{ USE_ERRORS_TO })) { @@ -1551,7 +1551,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ERRORS_TO' && $diff->{ USE_ERRORS_TO })) { @@ -1560,7 +1560,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ERRORS_TO' && $diff->{ ERRORS_TO })) { @@ -1569,7 +1569,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ORIGINAL_MESSAGE_ID' && $diff->{ USE_ORIGINAL_MESSAGE_ID })) { @@ -1578,7 +1578,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ORIGINAL_MESSAGE_ID' && $diff->{ USE_ORIGINAL_MESSAGE_ID })) { @@ -1587,7 +1587,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PRECEDENCE' && $diff->{ PRECEDENCE })) { @@ -1596,7 +1596,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PRECEDENCE' && $diff->{ PRECEDENCE })) { @@ -1605,7 +1605,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'APPEND_STARDATE' && $diff->{ APPEND_STARDATE })) { @@ -1614,7 +1614,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'APPEND_STARDATE' && $diff->{ APPEND_STARDATE })) { @@ -1623,7 +1623,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_RFC2369' && $diff->{ USE_RFC2369 })) { @@ -1632,7 +1632,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_RFC2369' && $diff->{ USE_RFC2369 })) { @@ -1641,7 +1641,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_SOFTWARE' && $diff->{ LIST_SOFTWARE })) { @@ -1650,7 +1650,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_POST' && $diff->{ LIST_POST })) { @@ -1659,7 +1659,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_OWNER' && $diff->{ LIST_OWNER })) { @@ -1668,7 +1668,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_HELP' && $diff->{ LIST_HELP })) { @@ -1677,7 +1677,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_SUBSCRIBE' && $diff->{ LIST_SUBSCRIBE })) { @@ -1686,7 +1686,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_UNSUBSCRIBE' && $diff->{ LIST_UNSUBSCRIBE })) { @@ -1695,7 +1695,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIST_ID' && $diff->{ LIST_ID })) { @@ -1704,7 +1704,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REWRITE_TO' && $diff->{ REWRITE_TO })) { @@ -1713,7 +1713,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REWRITE_TO' && $diff->{ REWRITE_TO })) { @@ -1722,7 +1722,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'REWRITE_TO' && $diff->{ REWRITE_TO })) { @@ -1731,7 +1731,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'Subject' && $diff->{ Subject })) { @@ -1740,7 +1740,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'From_address' && $diff->{ From_address })) { @@ -1749,7 +1749,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'User' && $diff->{ User })) { @@ -1758,7 +1758,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'Date' && $diff->{ Date })) { @@ -1767,7 +1767,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TZone' && $diff->{ TZone })) { @@ -1776,7 +1776,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TZone' && $diff->{ TZone })) { @@ -1785,7 +1785,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TZONE_DST' && $diff->{ TZONE_DST })) { @@ -1794,7 +1794,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PASS_ALL_FIELDS_IN_HEADER' && $diff->{ PASS_ALL_FIELDS_IN_HEADER })) { @@ -1803,7 +1803,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUPERFLUOUS_HEADERS' && $diff->{ SUPERFLUOUS_HEADERS })) { @@ -1812,7 +1812,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SKIP_FIELDS' && $diff->{ SKIP_FIELDS })) { @@ -1821,7 +1821,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ALLOW_WRONG_LINES_IN_HEADER' && $diff->{ ALLOW_WRONG_LINES_IN_HEADER })) { @@ -1830,7 +1830,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMMAND_SYNTAX_EXTENSION' && $diff->{ COMMAND_SYNTAX_EXTENSION })) { @@ -1839,7 +1839,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SUBJECT_AS_COMMANDS' && $diff->{ USE_SUBJECT_AS_COMMANDS })) { @@ -1848,7 +1848,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_WARNING' && $diff->{ USE_WARNING })) { @@ -1857,7 +1857,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_WARNING' && $diff->{ USE_WARNING })) { @@ -1866,7 +1866,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMMAND_ONLY_SERVER' && $diff->{ COMMAND_ONLY_SERVER })) { @@ -1875,7 +1875,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMMAND_CHECK_LIMIT' && $diff->{ COMMAND_CHECK_LIMIT })) { @@ -1884,7 +1884,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GUIDE_CHECK_LIMIT' && $diff->{ GUIDE_CHECK_LIMIT })) { @@ -1893,7 +1893,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GUIDE_KEYWORD' && $diff->{ GUIDE_KEYWORD })) { @@ -1902,7 +1902,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAXLEN_COMMAND_INPUT' && $diff->{ MAXLEN_COMMAND_INPUT })) { @@ -1911,7 +1911,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAXNUM_COMMAND_INPUT' && $diff->{ MAXNUM_COMMAND_INPUT })) { @@ -1920,7 +1920,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHADDR_KEYWORD' && $diff->{ CHADDR_KEYWORD })) { @@ -1929,7 +1929,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CHADDR_REPLY_TO' && $diff->{ CHADDR_REPLY_TO })) { @@ -1938,7 +1938,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ADMIN_CHADDR_REPLY_TO' && $diff->{ ADMIN_CHADDR_REPLY_TO })) { @@ -1947,7 +1947,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MGET_MODE_DEFAULT' && $diff->{ MGET_MODE_DEFAULT })) { @@ -1956,7 +1956,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MGET_TEXT_MODE_DEFAULT' && $diff->{ MGET_TEXT_MODE_DEFAULT })) { @@ -1965,7 +1965,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAIL_LENGTH_LIMIT' && $diff->{ MAIL_LENGTH_LIMIT })) { @@ -1974,7 +1974,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SLEEPTIME' && $diff->{ SLEEPTIME })) { @@ -1983,7 +1983,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_VERSION' && $diff->{ MIME_VERSION })) { @@ -1992,7 +1992,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_CONTENT_TYPE' && $diff->{ MIME_CONTENT_TYPE })) { @@ -2001,7 +2001,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_BOUNDARY' && $diff->{ MIME_MULTIPART_BOUNDARY })) { @@ -2010,7 +2010,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_CLOSE_DELIMITER' && $diff->{ MIME_MULTIPART_CLOSE_DELIMITER })) { @@ -2019,7 +2019,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_DELIMITER' && $diff->{ MIME_MULTIPART_DELIMITER })) { @@ -2028,7 +2028,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_PREAMBLE' && $diff->{ MIME_MULTIPART_PREAMBLE })) { @@ -2037,7 +2037,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_MULTIPART_TRAILER' && $diff->{ MIME_MULTIPART_TRAILER })) { @@ -2046,7 +2046,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SJIS_IN_ISH' && $diff->{ USE_SJIS_IN_ISH })) { @@ -2055,7 +2055,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RFC1153_ISSUE' && $diff->{ RFC1153_ISSUE })) { @@ -2064,7 +2064,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RFC1153_VOL' && $diff->{ RFC1153_VOL })) { @@ -2073,7 +2073,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RFC1153_SEQUENCE_FILE' && $diff->{ RFC1153_SEQUENCE_FILE })) { @@ -2082,7 +2082,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_DOT_QMAIL_EXT' && $diff->{ USE_DOT_QMAIL_EXT })) { @@ -2091,7 +2091,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FORCE_COMMAND_REPLY_TO' && $diff->{ FORCE_COMMAND_REPLY_TO })) { @@ -2100,7 +2100,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MGET_SUBJECT_TEMPLATE' && $diff->{ MGET_SUBJECT_TEMPLATE })) { @@ -2109,7 +2109,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MESSAGE_RETURN_ADDR_POLICY' && $diff->{ MESSAGE_RETURN_ADDR_POLICY })) { @@ -2118,7 +2118,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_SUBJECT_TEMPLATE' && $diff->{ MSEND_SUBJECT_TEMPLATE })) { @@ -2127,7 +2127,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_RC' && $diff->{ MSEND_RC })) { @@ -2136,7 +2136,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_MODE_DEFAULT' && $diff->{ MSEND_MODE_DEFAULT })) { @@ -2145,7 +2145,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_DEFAULT_SUBJECT' && $diff->{ MSEND_DEFAULT_SUBJECT })) { @@ -2154,7 +2154,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_NOTIFICATION' && $diff->{ MSEND_NOTIFICATION })) { @@ -2163,7 +2163,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_NOTIFICATION_SUBJECT' && $diff->{ MSEND_NOTIFICATION_SUBJECT })) { @@ -2172,7 +2172,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_NOT_USE_X_ML_INFO' && $diff->{ MSEND_NOT_USE_X_ML_INFO })) { @@ -2181,7 +2181,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MSEND_NOT_USE_NEWSYSLOG' && $diff->{ MSEND_NOT_USE_NEWSYSLOG })) { @@ -2190,7 +2190,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MESSAGE_ID' && $diff->{ LOG_MESSAGE_ID })) { @@ -2199,7 +2199,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MESSAGE_ID_CACHE_BUFSIZE' && $diff->{ MESSAGE_ID_CACHE_BUFSIZE })) { @@ -2208,7 +2208,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOG_MAILBODY_CKSUM' && $diff->{ LOG_MAILBODY_CKSUM })) { @@ -2217,7 +2217,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MEMBER_LIST' && $diff->{ MEMBER_LIST })) { @@ -2226,7 +2226,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ACTIVE_LIST' && $diff->{ ACTIVE_LIST })) { @@ -2235,7 +2235,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GUIDE_FILE' && $diff->{ GUIDE_FILE })) { @@ -2244,7 +2244,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'OBJECTIVE_FILE' && $diff->{ OBJECTIVE_FILE })) { @@ -2253,7 +2253,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HELP_FILE' && $diff->{ HELP_FILE })) { @@ -2262,7 +2262,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DENY_FILE' && $diff->{ DENY_FILE })) { @@ -2271,7 +2271,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOGFILE' && $diff->{ LOGFILE })) { @@ -2280,7 +2280,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MGET_LOGFILE' && $diff->{ MGET_LOGFILE })) { @@ -2289,7 +2289,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOGFILE_SUFFIX' && $diff->{ LOGFILE_SUFFIX })) { @@ -2298,7 +2298,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEBUG_LOGFILE' && $diff->{ DEBUG_LOGFILE })) { @@ -2307,7 +2307,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUMMARY_FILE' && $diff->{ SUMMARY_FILE })) { @@ -2316,7 +2316,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SEQUENCE_FILE' && $diff->{ SEQUENCE_FILE })) { @@ -2325,7 +2325,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_FILE' && $diff->{ LOCK_FILE })) { @@ -2334,7 +2334,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_DIR' && $diff->{ LOCK_DIR })) { @@ -2343,7 +2343,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCKDIR' && $diff->{ LOCKDIR })) { @@ -2352,7 +2352,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCKFILE' && $diff->{ LOCKFILE })) { @@ -2361,7 +2361,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_INET6' && $diff->{ USE_INET6 })) { @@ -2370,7 +2370,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_INET6' && $diff->{ USE_INET6 })) { @@ -2379,7 +2379,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HOST' && $diff->{ HOST })) { @@ -2388,7 +2388,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PORT' && $diff->{ PORT })) { @@ -2397,7 +2397,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_SENDER' && $diff->{ SMTP_SENDER })) { @@ -2406,7 +2406,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_LOG' && $diff->{ SMTP_LOG })) { @@ -2415,7 +2415,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SMTP_LOG_ROTATE' && $diff->{ USE_SMTP_LOG_ROTATE })) { @@ -2424,7 +2424,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_LOG_ROTATE_EXPIRE_LIMIT' && $diff->{ SMTP_LOG_ROTATE_EXPIRE_LIMIT })) { @@ -2433,7 +2433,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NUM_SMTP_LOG_ROTATE' && $diff->{ NUM_SMTP_LOG_ROTATE })) { @@ -2442,7 +2442,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTP_LOG_ROTATE_TYPE' && $diff->{ SMTP_LOG_ROTATE_TYPE })) { @@ -2451,7 +2451,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_TRACE_SMTP' && $diff->{ NOT_TRACE_SMTP })) { @@ -2460,7 +2460,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_TRACE_SMTP' && $diff->{ NOT_TRACE_SMTP })) { @@ -2469,7 +2469,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TRACE_SMTP_DELAY' && $diff->{ TRACE_SMTP_DELAY })) { @@ -2478,7 +2478,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SMTP_PROFILE' && $diff->{ USE_SMTP_PROFILE })) { @@ -2487,7 +2487,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MCI_SMTP_HOSTS' && $diff->{ MCI_SMTP_HOSTS })) { @@ -2496,7 +2496,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_RELAY_SERVER' && $diff->{ DEFAULT_RELAY_SERVER })) { @@ -2505,7 +2505,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RELAY_HACK' && $diff->{ RELAY_HACK })) { @@ -2514,7 +2514,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CF_DEF' && $diff->{ CF_DEF })) { @@ -2523,7 +2523,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_OUTGOING_ADDRESS' && $diff->{ USE_OUTGOING_ADDRESS })) { @@ -2532,7 +2532,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'OUTGOING_ADDRESS' && $diff->{ OUTGOING_ADDRESS })) { @@ -2541,7 +2541,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_VERP' && $diff->{ USE_VERP })) { @@ -2550,7 +2550,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'POSTFIX_VERP_DELIMITERS' && $diff->{ POSTFIX_VERP_DELIMITERS })) { @@ -2559,7 +2559,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TRY_VERP_PER_DAY' && $diff->{ TRY_VERP_PER_DAY })) { @@ -2568,7 +2568,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_ESMTP_PIPELINING' && $diff->{ NOT_USE_ESMTP_PIPELINING })) { @@ -2577,7 +2577,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_SMTPFEED_F_OPTION' && $diff->{ USE_SMTPFEED_F_OPTION })) { @@ -2586,7 +2586,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_MIME' && $diff->{ USE_MIME })) { @@ -2595,7 +2595,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_MIME' && $diff->{ USE_MIME })) { @@ -2604,7 +2604,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_BROKEN_ENCODING_FIXUP' && $diff->{ MIME_BROKEN_ENCODING_FIXUP })) { @@ -2613,7 +2613,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MIME_DECODED_ARTICLE' && $diff->{ MIME_DECODED_ARTICLE })) { @@ -2622,7 +2622,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PREAMBLE_MAILBODY' && $diff->{ PREAMBLE_MAILBODY })) { @@ -2631,7 +2631,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TRAILER_MAILBODY' && $diff->{ TRAILER_MAILBODY })) { @@ -2640,7 +2640,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GOOD_BYE_PHRASE' && $diff->{ GOOD_BYE_PHRASE })) { @@ -2649,7 +2649,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FACE_MARK' && $diff->{ FACE_MARK })) { @@ -2658,7 +2658,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PROC_GEN_INFO' && $diff->{ PROC_GEN_INFO })) { @@ -2667,7 +2667,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_FLOCK' && $diff->{ USE_FLOCK })) { @@ -2676,7 +2676,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_FLOCK' && $diff->{ USE_FLOCK })) { @@ -2685,7 +2685,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MAX_TIMEOUT' && $diff->{ MAX_TIMEOUT })) { @@ -2694,7 +2694,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_SPOOL' && $diff->{ NOT_USE_SPOOL })) { @@ -2703,7 +2703,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_SPOOL' && $diff->{ NOT_USE_SPOOL })) { @@ -2712,7 +2712,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMPAT_FML15' && $diff->{ COMPAT_FML15 })) { @@ -2721,7 +2721,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NEWSYSLOG_MAX' && $diff->{ NEWSYSLOG_MAX })) { @@ -2730,7 +2730,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CRONTAB' && $diff->{ CRONTAB })) { @@ -2739,7 +2739,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CRON_PIDFILE' && $diff->{ CRON_PIDFILE })) { @@ -2748,7 +2748,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CRON_NOTIFY' && $diff->{ CRON_NOTIFY })) { @@ -2757,7 +2757,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_CROSSPOST' && $diff->{ USE_CROSSPOST })) { @@ -2766,7 +2766,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_MEMBER_NAME' && $diff->{ USE_MEMBER_NAME })) { @@ -2775,7 +2775,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_EXPIRE' && $diff->{ USE_EXPIRE })) { @@ -2784,7 +2784,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'EXPIRE_SUMMARY' && $diff->{ EXPIRE_SUMMARY })) { @@ -2793,7 +2793,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'EXPIRE_LIMIT' && $diff->{ EXPIRE_LIMIT })) { @@ -2802,7 +2802,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_ARCHIVE' && $diff->{ USE_ARCHIVE })) { @@ -2811,7 +2811,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ARCHIVE_UNIT' && $diff->{ ARCHIVE_UNIT })) { @@ -2820,7 +2820,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_ARCHIVE_UNIT' && $diff->{ DEFAULT_ARCHIVE_UNIT })) { @@ -2829,7 +2829,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ARCHIVE_DIR' && $diff->{ ARCHIVE_DIR })) { @@ -2838,7 +2838,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'INDEX_FILE' && $diff->{ INDEX_FILE })) { @@ -2847,7 +2847,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'INDEX_SHOW_DIRNAME' && $diff->{ INDEX_SHOW_DIRNAME })) { @@ -2856,7 +2856,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIBRARY_DIR' && $diff->{ LIBRARY_DIR })) { @@ -2865,7 +2865,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIBRARY_ARCHIVE_DIR' && $diff->{ LIBRARY_ARCHIVE_DIR })) { @@ -2874,7 +2874,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOGFILE_NEWSYSLOG_LIMIT' && $diff->{ LOGFILE_NEWSYSLOG_LIMIT })) { @@ -2883,7 +2883,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AMLIST_NEWSYSLOG_LIMIT' && $diff->{ AMLIST_NEWSYSLOG_LIMIT })) { @@ -2892,7 +2892,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_HTML_GEN' && $diff->{ AUTO_HTML_GEN })) { @@ -2901,7 +2901,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AUTO_HTML_GEN' && $diff->{ AUTO_HTML_GEN })) { @@ -2910,7 +2910,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_NEW_HTML_GEN' && $diff->{ USE_NEW_HTML_GEN })) { @@ -2919,7 +2919,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_NEW_HTML_GEN' && $diff->{ USE_NEW_HTML_GEN })) { @@ -2928,7 +2928,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD' && $diff->{ HTML_THREAD })) { @@ -2937,7 +2937,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD' && $diff->{ HTML_THREAD })) { @@ -2946,7 +2946,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDEX_REVERSE_ORDER' && $diff->{ HTML_INDEX_REVERSE_ORDER })) { @@ -2955,7 +2955,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDEX_REVERSE_ORDER' && $diff->{ HTML_INDEX_REVERSE_ORDER })) { @@ -2964,7 +2964,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_DIR' && $diff->{ HTML_DIR })) { @@ -2973,7 +2973,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_EXPIRE_LIMIT' && $diff->{ HTML_EXPIRE_LIMIT })) { @@ -2982,7 +2982,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDEX_TITLE' && $diff->{ HTML_INDEX_TITLE })) { @@ -2991,7 +2991,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_DATA_CACHE' && $diff->{ HTML_DATA_CACHE })) { @@ -3000,7 +3000,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_DATA_THREAD' && $diff->{ HTML_DATA_THREAD })) { @@ -3009,7 +3009,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_OUTPUT_FILTER' && $diff->{ HTML_OUTPUT_FILTER })) { @@ -3018,7 +3018,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_STYLESHEET_BASENAME' && $diff->{ HTML_STYLESHEET_BASENAME })) { @@ -3027,7 +3027,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD_REF_TYPE' && $diff->{ HTML_THREAD_REF_TYPE })) { @@ -3036,7 +3036,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD_REF_TYPE' && $diff->{ HTML_THREAD_REF_TYPE })) { @@ -3045,7 +3045,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD_SORT_TYPE' && $diff->{ HTML_THREAD_SORT_TYPE })) { @@ -3054,7 +3054,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_THREAD_SORT_TYPE' && $diff->{ HTML_THREAD_SORT_TYPE })) { @@ -3063,7 +3063,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDEX_UNIT' && $diff->{ HTML_INDEX_UNIT })) { @@ -3072,7 +3072,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_INDENT_STYLE' && $diff->{ HTML_INDENT_STYLE })) { @@ -3081,7 +3081,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_MULTIPART_IMAGE_REF_TYPE' && $diff->{ HTML_MULTIPART_IMAGE_REF_TYPE })) { @@ -3090,7 +3090,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_DEFAULT_UMASK' && $diff->{ HTML_DEFAULT_UMASK })) { @@ -3099,7 +3099,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HTML_WRITE_UMASK' && $diff->{ HTML_WRITE_UMASK })) { @@ -3108,7 +3108,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_DATABASE' && $diff->{ USE_DATABASE })) { @@ -3117,7 +3117,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATABASE_METHOD' && $diff->{ DATABASE_METHOD })) { @@ -3126,7 +3126,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATABASE_CACHE_FILE_SUFFIX' && $diff->{ DATABASE_CACHE_FILE_SUFFIX })) { @@ -3135,7 +3135,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATABASE_DRIVER' && $diff->{ DATABASE_DRIVER })) { @@ -3144,7 +3144,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DATABASE_DRIVER_ATTRIBUTES' && $diff->{ DATABASE_DRIVER_ATTRIBUTES })) { @@ -3153,7 +3153,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_SERVER_HOST' && $diff->{ SQL_SERVER_HOST })) { @@ -3162,7 +3162,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_SERVER_PORT' && $diff->{ SQL_SERVER_PORT })) { @@ -3171,7 +3171,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_SERVER_USER' && $diff->{ SQL_SERVER_USER })) { @@ -3180,7 +3180,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_DATABASE_NAME' && $diff->{ SQL_DATABASE_NAME })) { @@ -3189,7 +3189,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_SERVER_PASSWORD' && $diff->{ SQL_SERVER_PASSWORD })) { @@ -3198,7 +3198,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SQL_DATABASE_NAME' && $diff->{ SQL_DATABASE_NAME })) { @@ -3207,7 +3207,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_SERVER_HOST' && $diff->{ LDAP_SERVER_HOST })) { @@ -3216,7 +3216,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_SERVER_PASSWORD' && $diff->{ LDAP_SERVER_PASSWORD })) { @@ -3225,7 +3225,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_SEARCH_BASE' && $diff->{ LDAP_SEARCH_BASE })) { @@ -3234,7 +3234,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_SERVER_BIND' && $diff->{ LDAP_SERVER_BIND })) { @@ -3243,7 +3243,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LDAP_QUERY_FILTER' && $diff->{ LDAP_QUERY_FILTER })) { @@ -3252,7 +3252,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_WHOIS' && $diff->{ USE_WHOIS })) { @@ -3261,7 +3261,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_WHOIS_SERVER' && $diff->{ DEFAULT_WHOIS_SERVER })) { @@ -3270,7 +3270,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WHOIS_DB' && $diff->{ WHOIS_DB })) { @@ -3279,7 +3279,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WHOIS_HELP_FILE' && $diff->{ WHOIS_HELP_FILE })) { @@ -3288,7 +3288,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'WHOIS_JCODE_P' && $diff->{ WHOIS_JCODE_P })) { @@ -3297,7 +3297,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CPU_TYPE_MANUFACTURER_OS' && $diff->{ CPU_TYPE_MANUFACTURER_OS })) { @@ -3306,7 +3306,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'STRUCT_SOCKADDR' && $diff->{ STRUCT_SOCKADDR })) { @@ -3315,7 +3315,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_SH' && $diff->{ LOCK_SH })) { @@ -3324,7 +3324,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_EX' && $diff->{ LOCK_EX })) { @@ -3333,7 +3333,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_NB' && $diff->{ LOCK_NB })) { @@ -3342,7 +3342,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOCK_UN' && $diff->{ LOCK_UN })) { @@ -3351,7 +3351,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMPAT_SOLARIS2' && $diff->{ COMPAT_SOLARIS2 })) { @@ -3360,7 +3360,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'NOT_USE_TIOCNOTTY' && $diff->{ NOT_USE_TIOCNOTTY })) { @@ -3369,7 +3369,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HAS_GETPWUID' && $diff->{ HAS_GETPWUID })) { @@ -3378,7 +3378,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HAS_GETPWGID' && $diff->{ HAS_GETPWGID })) { @@ -3387,7 +3387,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HAS_ALARM' && $diff->{ HAS_ALARM })) { @@ -3396,7 +3396,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'UNISTD' && $diff->{ UNISTD })) { @@ -3405,7 +3405,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SENDMAIL' && $diff->{ SENDMAIL })) { @@ -3414,7 +3414,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'TAR' && $diff->{ TAR })) { @@ -3423,7 +3423,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'UUENCODE' && $diff->{ UUENCODE })) { @@ -3432,7 +3432,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'COMPRESS' && $diff->{ COMPRESS })) { @@ -3441,7 +3441,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ZCAT' && $diff->{ ZCAT })) { @@ -3450,7 +3450,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LHA' && $diff->{ LHA })) { @@ -3459,7 +3459,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ISH' && $diff->{ ISH })) { @@ -3468,7 +3468,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ZIP' && $diff->{ ZIP })) { @@ -3477,7 +3477,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BZIP2' && $diff->{ BZIP2 })) { @@ -3486,7 +3486,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGP' && $diff->{ PGP })) { @@ -3495,7 +3495,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGP5' && $diff->{ PGP5 })) { @@ -3504,7 +3504,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGPE' && $diff->{ PGPE })) { @@ -3513,7 +3513,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGPK' && $diff->{ PGPK })) { @@ -3522,7 +3522,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGPS' && $diff->{ PGPS })) { @@ -3531,7 +3531,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PGPV' && $diff->{ PGPV })) { @@ -3540,7 +3540,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'GPG' && $diff->{ GPG })) { @@ -3549,7 +3549,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RCS' && $diff->{ RCS })) { @@ -3558,7 +3558,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CI' && $diff->{ CI })) { @@ -3567,7 +3567,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BASE64_DECODE' && $diff->{ BASE64_DECODE })) { @@ -3576,7 +3576,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'BASE64_ENCODE' && $diff->{ BASE64_ENCODE })) { @@ -3585,7 +3585,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'MD5' && $diff->{ MD5 })) { @@ -3594,7 +3594,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SMTPLOG' && $diff->{ SMTPLOG })) { @@ -3603,7 +3603,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PROHIBIT_COMMAND_FOR_STRANGER' && $diff->{ PROHIBIT_COMMAND_FOR_STRANGER })) { @@ -3612,7 +3612,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'PROHIBIT_COMMAND_FOR_STRANGER' && $diff->{ PROHIBIT_COMMAND_FOR_STRANGER })) { @@ -3621,7 +3621,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_LIBMIME' && $diff->{ USE_LIBMIME })) { @@ -3630,7 +3630,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'USE_LIBMIME' && $diff->{ USE_LIBMIME })) { @@ -3639,7 +3639,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LIBMIMEDIR' && $diff->{ LIBMIMEDIR })) { @@ -3648,7 +3648,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RPG_ML_FORM_FLAG' && $diff->{ RPG_ML_FORM_FLAG })) { @@ -3657,7 +3657,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RPG_ML_FORM_FLAG' && $diff->{ RPG_ML_FORM_FLAG })) { @@ -3666,7 +3666,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUN_OS_413' && $diff->{ SUN_OS_413 })) { @@ -3675,7 +3675,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUN_OS_413' && $diff->{ SUN_OS_413 })) { @@ -3684,7 +3684,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'SUBJECT_HML_FORM' && $diff->{ SUBJECT_HML_FORM })) { @@ -3693,7 +3693,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'HML_FORM_LONG_ID' && $diff->{ HML_FORM_LONG_ID })) { @@ -3702,7 +3702,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'ML_MEMBER_CHECK' && $diff->{ ML_MEMBER_CHECK })) { @@ -3711,7 +3711,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_HTTP_PORT' && $diff->{ DEFAULT_HTTP_PORT })) { @@ -3720,7 +3720,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_GOPHER_PORT' && $diff->{ DEFAULT_GOPHER_PORT })) { @@ -3729,7 +3729,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'DEFAULT_HTML_FIELD' && $diff->{ DEFAULT_HTML_FIELD })) { @@ -3738,7 +3738,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'CP' && $diff->{ CP })) { @@ -3747,7 +3747,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'RM' && $diff->{ RM })) { @@ -3756,7 +3756,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'FML' && $diff->{ FML })) { @@ -3765,7 +3765,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'LOAD_LIBRARY' && $diff->{ LOAD_LIBRARY })) { @@ -3774,7 +3774,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'STORED_BOUNDARY' && $diff->{ STORED_BOUNDARY })) { @@ -3783,7 +3783,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq 'AGAINST_NIFTY' && $diff->{ AGAINST_NIFTY })) { @@ -3792,7 +3792,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq '_Ds' && $diff->{ _Ds })) { @@ -3801,7 +3801,7 @@ sub translate } } return $s if defined $s; - + $s = undef; if (($key eq '_Dm' && $diff->{ _Dm })) { @@ -3810,7 +3810,7 @@ sub translate } } return $s if defined $s; - + return ''; diff --git a/fml/lib/FML/Merge/FML4/config_ph.pm b/fml/lib/FML/Merge/FML4/config_ph.pm index 9e0cc7ef..ba5344ed 100644 --- a/fml/lib/FML/Merge/FML4/config_ph.pm +++ b/fml/lib/FML/Merge/FML4/config_ph.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: config_ph.pm,v 1.19 2006/01/04 07:47:26 fukachan Exp $ +# $FML: config_ph.pm,v 1.20 2006/01/08 12:32:51 fukachan Exp $ # package FML::Merge::FML4::config_ph; @@ -333,7 +333,7 @@ translate fml4 config {$key => $value } to fml8 one if could. # Descriptions: translate fml4 config {$key => $value } to fml8 one if could. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -349,10 +349,10 @@ sub translate }; use FML::Merge::FML4::Rules; - my $s = FML::Merge::FML4::Rules::translate($self, + my $s = FML::Merge::FML4::Rules::translate($self, $dispatch, $config, - $diff, + $diff, $key, $value); return $s; @@ -493,7 +493,7 @@ sub translate_xxx # Descriptions: restrictions -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -513,9 +513,9 @@ sub _fix_restrictions my $mode = 'manual'; my $symmetric = 1; - # + # # permit_*_from based - # + # if ($permit_post_from eq 'anyone') { $p_result .= "article_post_restrictions = "; $p_result .= "reject_system_special_accounts "; @@ -534,7 +534,7 @@ sub _fix_restrictions # # handler based - # + # if ($reject_post_handler =~ /auto_regist|autoregist|auto_subscribe/) { $mode = "automatic"; $symmetric = 1; @@ -572,7 +572,7 @@ sub _fix_restrictions $c_result .= "ignore\n"; } } - elsif ($reject_command_handler =~ + elsif ($reject_command_handler =~ /auto_regist|autoregist|auto_subscribe/) { $mode = "automatic"; $symmetric = 1; @@ -610,7 +610,7 @@ sub _fix_restrictions # Descriptions: handle map info. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -625,7 +625,7 @@ sub _fix_map # Descriptions: handle directory info. # Arguments: OBJ($self) -# HASH_REF($config) HASH_REF($diff) +# HASH_REF($config) HASH_REF($diff) # STR($key) STR($value) STR($match) # Side Effects: none # Return Value: STR @@ -652,7 +652,7 @@ sub _fix_dir # Descriptions: acl policy. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -675,7 +675,7 @@ sub _fix_acl_policy # Descriptions: acl policy. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -694,7 +694,7 @@ sub _fix_module_definition # Descriptions: fix time zone. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -711,7 +711,7 @@ sub _fix_time_zone # Descriptions: handle subject tag related conversion. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -725,7 +725,7 @@ sub _fix_skip_fields # Descriptions: handle subject tag related conversion. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -795,7 +795,7 @@ sub _fix_subject_tag # Descriptions: ignore translation since this variable uses fml8 value. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -808,7 +808,7 @@ sub translate_use_fml8_value # Descriptions: ignore translation since this variable uses fml8 value. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR @@ -821,7 +821,7 @@ sub translate_ignore # Descriptions: show this variable is not yet implemented. -# Arguments: OBJ($self) +# Arguments: OBJ($self) # HASH_REF($config) HASH_REF($diff) STR($key) STR($value) # Side Effects: none # Return Value: STR diff --git a/fml/lib/FML/Moderate.pm b/fml/lib/FML/Moderate.pm index 2a493999..1641cf54 100644 --- a/fml/lib/FML/Moderate.pm +++ b/fml/lib/FML/Moderate.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2005 Ken'ichi Fukamachi +# Copyright (C) 2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Moderate.pm,v 1.2 2005/12/18 12:28:49 fukachan Exp $ +# $FML: Moderate.pm,v 1.3 2005/12/19 03:06:32 fukachan Exp $ # package FML::Moderate; @@ -65,7 +65,7 @@ sub forward_to_moderator $queue->remove(); if ($nqid) { $curproc->log("moderation request queue-in: qid=$nqid"); - } + } # 2. generate confirm id. $self->_send_confirmation($rm_args, { queue_id => $nqid }); @@ -134,7 +134,7 @@ sub _queue_init directory => $queue_dir, local_class => [ $moderation_queue ], id => $qid, - }; + }; } else { return new Mail::Delivery::Queue { @@ -225,7 +225,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2005 Ken'ichi Fukamachi +Copyright (C) 2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/PCB.pm b/fml/lib/FML/PCB.pm index 7fa755d3..b67231cf 100644 --- a/fml/lib/FML/PCB.pm +++ b/fml/lib/FML/PCB.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: PCB.pm,v 1.21 2005/05/27 03:03:32 fukachan Exp $ +# $FML: PCB.pm,v 1.22 2005/06/01 10:23:33 fukachan Exp $ # package FML::PCB; @@ -122,8 +122,8 @@ sub dump_variables printf "%-21s => {\n", $current_context; printf " %-18s => {\n", $k; printf " %-15s => %-15s\n", $xk, $xv; - printf " }\n"; - printf "}\n\n"; + printf " }\n"; + printf "}\n\n"; } } } @@ -173,7 +173,7 @@ get the current context name. # Descriptions: switch the current context. # Arguments: OBJ($self) STR($context) -# Side Effects: overload $current_context. +# Side Effects: overload $current_context. # Return Value: none sub set_current_context { @@ -224,7 +224,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Process/CGI/Kernel.pm b/fml/lib/FML/Process/CGI/Kernel.pm index 03dabb99..c4768b1f 100644 --- a/fml/lib/FML/Process/CGI/Kernel.pm +++ b/fml/lib/FML/Process/CGI/Kernel.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # 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.88 2005/08/17 10:33:18 fukachan Exp $ +# $FML: Kernel.pm,v 1.89 2005/08/19 11:23:03 fukachan Exp $ # package FML::Process::CGI::Kernel; @@ -432,7 +432,7 @@ sub cgi_execute_command my $comname = $command_args->{ comname }; my $config = $curproc->config(); - # XXX $comname is one of strings defined in the config file, + # XXX $comname is one of strings defined in the config file, # XXX NOT user defined one. unless ($config->has_attribute("admin_cgi_allowed_commands", $comname)) { $curproc->logerror("cgi deny command: mode=$commode level=cgi"); @@ -897,7 +897,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Process/Configure.pm b/fml/lib/FML/Process/Configure.pm index 4296df5c..a9f758ea 100644 --- a/fml/lib/FML/Process/Configure.pm +++ b/fml/lib/FML/Process/Configure.pm @@ -1,9 +1,9 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Configure.pm,v 1.69 2005/06/04 08:49:09 fukachan Exp $ +# $FML: Configure.pm,v 1.70 2005/08/10 15:03:25 fukachan Exp $ # package FML::Process::Configure; @@ -140,7 +140,7 @@ sub run } -# Descriptions: send a report mail +# Descriptions: send a report mail # if --allow-send-message or --allow-reply-message # option specified. # Arguments: OBJ($curproc) HASH_REF($args) @@ -311,7 +311,7 @@ sub _makefml options => \@options, argv => $argv, - # save raw argv for {new,rm}domain commands, which need + # save raw argv for {new,rm}domain commands, which need # for some programs to interprete $ml_name as ml_domain. canon_argv => { ml_name => $argv_ml_name, @@ -379,7 +379,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm index 136c7dd2..8320b17a 100644 --- a/fml/lib/FML/Process/Distribute.pm +++ b/fml/lib/FML/Process/Distribute.pm @@ -1,9 +1,9 @@ #-*- perl -*- # -# Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Distribute.pm,v 1.166 2005/11/30 23:30:38 fukachan Exp $ +# $FML: Distribute.pm,v 1.167 2005/12/19 03:06:02 fukachan Exp $ # package FML::Process::Distribute; @@ -580,7 +580,7 @@ sub _deliver_article $curproc->unlock($lock_channel); } else { - # XXX-TODO: o.k. ? + # XXX-TODO: o.k. ? $curproc->logerror("queue: cannot initialize queue system"); $fatal = 1; } @@ -716,7 +716,7 @@ sub _new_thread_check_post $article->add_outline($tdb_args); } - + # Descriptions: the top level entry to create HTML article. # Arguments: OBJ($curproc) # Side Effects: update html database @@ -772,7 +772,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Process/Fake.pm b/fml/lib/FML/Process/Fake.pm index 22b3aae8..46114061 100644 --- a/fml/lib/FML/Process/Fake.pm +++ b/fml/lib/FML/Process/Fake.pm @@ -1,9 +1,9 @@ #-*- perl -*- # -# Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Fake.pm,v 1.14 2005/08/10 15:03:27 fukachan Exp $ +# $FML: Fake.pm,v 1.15 2005/08/17 10:54:09 fukachan Exp $ # package FML::Process::Fake; @@ -227,13 +227,13 @@ sub _faker_init $curproc->log_message_init(); # we assume - # + # # [/etc/postfix/virtual] # @domain faker=domain@${default_domain} - # + # # [default_domain's alias file] # faker=domain: "|/usr/local/libexec/fml/faker @domain" - # + # if ($curproc->is_valid_domain_syntax($faker_domain)) { $curproc->_set_emul_domain($faker_domain); } @@ -513,7 +513,7 @@ sub _set_emul_ml_list } -# Descriptions: +# Descriptions: # Arguments: OBJ($curproc) # Side Effects: none # Return Value: ARRAY_REF @@ -548,7 +548,7 @@ sub _set_emul_user_list } -# Descriptions: +# Descriptions: # Arguments: OBJ($curproc) # Side Effects: none # Return Value: ARRAY_REF @@ -570,7 +570,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Process/FetchFML.pm b/fml/lib/FML/Process/FetchFML.pm index 0b9a21b6..4c50a386 100644 --- a/fml/lib/FML/Process/FetchFML.pm +++ b/fml/lib/FML/Process/FetchFML.pm @@ -1,9 +1,9 @@ #-*- perl -*- # -# Copyright (C) 2005 Ken'ichi Fukamachi +# Copyright (C) 2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: FetchFML.pm,v 1.5 2005/08/23 12:32:06 fukachan Exp $ +# $FML: FetchFML.pm,v 1.6 2005/12/17 13:47:32 fukachan Exp $ # package FML::Process::FetchFML; @@ -274,7 +274,7 @@ sub _fetchfml_retrieve $curproc->logerror("object undefined."); } - if ($mua->error()) { + if ($mua->error()) { $curproc->logerror($mua->error()); next MUA; } @@ -402,7 +402,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2005 Ken'ichi Fukamachi +Copyright (C) 2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm index 71a64756..76128eba 100644 --- a/fml/lib/FML/Process/Kernel.pm +++ b/fml/lib/FML/Process/Kernel.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # 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.270 2005/12/18 12:24:09 fukachan Exp $ +# $FML: Kernel.pm,v 1.271 2005/12/19 03:06:02 fukachan Exp $ # package FML::Process::Kernel; @@ -648,7 +648,7 @@ sub simple_loop_check $config->get_as_array_ref( 'incoming_mail_header_loop_check_rules' ); my $match = 0; - if ($config->yes('use_incoming_mail_header_loop_check')) { + if ($config->yes('use_incoming_mail_header_loop_check')) { RULE: for my $rule (@$rules) { if ($header->can($rule)) { @@ -829,12 +829,12 @@ sub ml_variables_resolve # Example: when fml.pl firstly runs without config.cf (fml8) file, # fml.pl should generate config.cf and continue to run. my $config_ph_path = $config_cf_path; - $config_ph_path =~ s/config.cf/config.ph/; + $config_ph_path =~ s/config.cf/config.ph/; use File::stat; my $stat_ph = -f $config_ph_path ? stat($config_ph_path) : undef; my $stat_cf = -f $config_cf_path ? stat($config_cf_path) : undef; - if ((! -f $config_cf_path) || - (defined $stat_ph && defined $stat_cf && + if ((! -f $config_cf_path) || + (defined $stat_ph && defined $stat_cf && $stat_ph->mtime > $stat_cf->mtime)) { my $fallback = $resolver_args->{ fallback } || undef; my $fallback_args = { @@ -919,10 +919,10 @@ sub __debug_ml_xxx @delayed_buffer = (); for my $var (qw(ml_name ml_domain ml_home_prefix ml_home_dir)) { - $curproc->logdebug(sprintf("%-25s = %s", + $curproc->logdebug(sprintf("%-25s = %s", "(debug)$str $var", - (defined $config->{ $var } ? - $config->{ $var } : + (defined $config->{ $var } ? + $config->{ $var } : ''))); } } @@ -1584,7 +1584,7 @@ sub logdebug msg_args => $msg_args, level => 'debug', caller => \@c, - }); + }); } } else { @@ -1656,8 +1656,8 @@ If given, makefml/fml ignores message output. # Descriptions: top level reply message interface. -# It injects the specified message into the system -# global message queue on memory in fact. +# It injects the specified message into the system +# global message queue on memory in fact. # reply_message_inform() recollects them and send it later. # Arguments: OBJ($curproc) OBJ($msg) HASH_REF($rm_args) # Side Effects: none @@ -1786,7 +1786,7 @@ sub _analyze_recipients # if both specified, use default sender. unless (@$recipient || @$recipient_maps) { - my $cred = $curproc->credential(); + my $cred = $curproc->credential(); my $sender = $cred->sender(); $recipient = [ $sender ]; } @@ -2454,7 +2454,7 @@ sub queue_in # default recipient if undefined. unless ($rcptkey) { - my $cred = $curproc->credential(); + my $cred = $curproc->credential(); my $sender = $cred->sender() || undef; if (defined $cred) { $rcptkey = $sender; @@ -2757,7 +2757,7 @@ sub incoming_message_cleanup_queue # XXX ONLY WHEN VALID $ml_home_dir EXISTS. if ($curproc->_is_valid_ml_home_dir()) { # 1. remove incoming queue files. - # 2. remove queues marked as removal in incoming/ queue. + # 2. remove queues marked as removal in incoming/ queue. # XXX cond. 1 must include cond. 2, # XXX but we try again to ensure garbage collection. $curproc->incoming_message_remove_queue(); @@ -2768,7 +2768,7 @@ sub incoming_message_cleanup_queue use Mail::Delivery::Queue; my $queue_dir = $config->{ mail_queue_dir }; - my $queue = new Mail::Delivery::Queue { + my $queue = new Mail::Delivery::Queue { directory => $queue_dir, }; $queue->set_log_function($fp); @@ -3083,7 +3083,7 @@ sub sysflow_reopen_stderr_channel $curproc->is_under_mta_process() || defined $option->{ quiet } || defined $option->{ q } || $config->yes('use_log_dup') || $option->{ 'log-dup' } || - $config->yes('use_log_computer_output') || + $config->yes('use_log_computer_output') || $option->{'log-computer-output'}) { my $tmpfile = $curproc->tmp_file_path(); my $pcb = $curproc->pcb(); @@ -3292,7 +3292,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Process/PGP.pm b/fml/lib/FML/Process/PGP.pm index e5127912..64c5eff8 100644 --- a/fml/lib/FML/Process/PGP.pm +++ b/fml/lib/FML/Process/PGP.pm @@ -1,9 +1,9 @@ #-*- perl -*- # -# Copyright (C) 2005 Ken'ichi Fukamachi +# Copyright (C) 2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: PGP.pm,v 1.4 2005/08/06 07:48:04 fukachan Exp $ +# $FML: PGP.pm,v 1.5 2005/08/10 15:03:27 fukachan Exp $ # package FML::Process::PGP; @@ -287,9 +287,9 @@ sub _setup_pgp_environment $curproc->mkdir($gpg_config_dir, "mode=private"); } - # + # # CONVENSIONAL NAME. - # + # $curproc->_symlink_admin_dir("pgp"); $curproc->_symlink_admin_dir("gpg"); } @@ -348,7 +348,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2005 Ken'ichi Fukamachi +Copyright (C) 2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Process/Switch.pm b/fml/lib/FML/Process/Switch.pm index 30892f87..b0a4e138 100644 --- a/fml/lib/FML/Process/Switch.pm +++ b/fml/lib/FML/Process/Switch.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Switch.pm,v 1.111 2005/12/17 13:47:32 fukachan Exp $ +# $FML: Switch.pm,v 1.112 2005/12/18 11:52:49 fukachan Exp $ # package FML::Process::Switch; @@ -249,7 +249,7 @@ restart new another process (switch to it on running). # Descriptions: restart new another process (switch to it on running). -# Arguments: OBJ($curproc) +# Arguments: OBJ($curproc) # STR($new_myname) STR($ml_name) STR($ml_domain) # HASH_REF($hints) # Side Effects: none @@ -262,7 +262,7 @@ sub NewProcess use File::Basename; my $old_myname = basename($0); - # fake another $args as could as possible. + # fake another $args as could as possible. # XXX (ARGV options main_cf module_info argv curproc cf_list) # XXX these are references, which inherits the original value in $args. my $args = $curproc->dup_curproc_args(); @@ -275,7 +275,7 @@ sub NewProcess # overload options my $_opts = $hints->{ config_overload } || {}; - for my $k (keys %$_opts) { + for my $k (keys %$_opts) { $args->{ options }->{ o }->{ $k } = $_opts->{ $k }; } @@ -614,7 +614,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Process/Utils.pm b/fml/lib/FML/Process/Utils.pm index f262845c..60b64df3 100644 --- a/fml/lib/FML/Process/Utils.pm +++ b/fml/lib/FML/Process/Utils.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # 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.142 2005/12/17 13:47:58 fukachan Exp $ +# $FML: Utils.pm,v 1.143 2005/12/18 11:53:26 fukachan Exp $ # package FML::Process::Utils; @@ -279,7 +279,7 @@ sub incoming_message_get_current_queue sub incoming_message_stack_queue_for_removal { my ($curproc, $queue) = @_; - my $shm = $curproc->shared_hash_get("incoming_message", + my $shm = $curproc->shared_hash_get("incoming_message", "queue_stack_for_removal"); if (defined $queue) { @@ -307,7 +307,7 @@ sub incoming_message_remove_queue } # 2. additional todo (e.g. fetchfml requests). - my $shm = $curproc->shared_hash_get("incoming_message", + my $shm = $curproc->shared_hash_get("incoming_message", "queue_stack_for_removal"); my $rmlist = $shm->{ stack } || []; @@ -1817,7 +1817,7 @@ sub langinfo_get_charset } # search charset most preferred by Accpet-Language: in our templates. else { - my $found = 0; + my $found = 0; # XXX Accept-Language: affets $reply_message_charset and $cgi_charset. # XXX $reply_mesage_charset indirectly affets $template_file_charset. @@ -2147,7 +2147,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Restriction/Command.pm b/fml/lib/FML/Restriction/Command.pm index 36822dd5..fd4ec387 100644 --- a/fml/lib/FML/Restriction/Command.pm +++ b/fml/lib/FML/Restriction/Command.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Command.pm,v 1.20 2005/11/30 23:30:39 fukachan Exp $ +# $FML: Command.pm,v 1.21 2005/12/18 11:53:59 fukachan Exp $ # package FML::Restriction::Command; @@ -87,7 +87,7 @@ sub permit_user_command } -# Descriptions: permit specific anonymous command +# Descriptions: permit specific anonymous command # even if $sender is a stranger. # Arguments: OBJ($self) STR($rule) STR($sender) HASH_REF($v_args) # Side Effects: none @@ -394,7 +394,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/FML/Restriction/Post.pm b/fml/lib/FML/Restriction/Post.pm index f4ecf60f..bdb7ba7a 100644 --- a/fml/lib/FML/Restriction/Post.pm +++ b/fml/lib/FML/Restriction/Post.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2003,2004,2005,2006 Ken'ichi Fukamachi # 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.23 2005/12/19 03:07:31 fukachan Exp $ +# $FML: Post.pm,v 1.24 2005/12/19 11:29:40 fukachan Exp $ # package FML::Restriction::Post; @@ -184,7 +184,7 @@ sub check_article_thread } } - # + # if ($match) { $curproc->logdebug("check_article_thread matched. ($match sec old)"); return("matched", "permit"); @@ -362,7 +362,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/IO/Adapter/DBI.pm b/fml/lib/IO/Adapter/DBI.pm index 07b5ad9c..35d8c012 100644 --- a/fml/lib/IO/Adapter/DBI.pm +++ b/fml/lib/IO/Adapter/DBI.pm @@ -1,9 +1,9 @@ #-*- perl -*- # -# Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. # -# $FML: DBI.pm,v 1.33 2005/08/17 12:08:47 fukachan Exp $ +# $FML: DBI.pm,v 1.34 2005/08/23 08:38:22 fukachan Exp $ # package IO::Adapter::DBI; @@ -138,14 +138,14 @@ sub open my $password = $self->{ _sql_password} || ''; my $last_error = ''; my $dbh = undef; - + DSN: for my $dsn (@$dsn_list) { print STDERR "open $dsn\n" if $debug; # try to connect use DBI; - $dbh = DBI->connect($dsn, $user, $password, { + $dbh = DBI->connect($dsn, $user, $password, { RaiseError => 1, AutoCommit => 0, }); @@ -291,7 +291,7 @@ sub _fetch_all { my ($self, $args) = @_; my $config = $self->{ _config }; - my $query = + my $query = $config->{ sql_query_get_next_key } || $config->{ sql_get_next_key }; $self->execute({ query => $query }); @@ -422,7 +422,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2000,2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/IO/Adapter/File.pm b/fml/lib/IO/Adapter/File.pm index 0e319129..949b4c35 100644 --- a/fml/lib/IO/Adapter/File.pm +++ b/fml/lib/IO/Adapter/File.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # 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.60 2004/08/14 05:02:00 fukachan Exp $ +# $FML: File.pm,v 1.61 2005/05/27 03:03:40 fukachan Exp $ # package IO::Adapter::File; @@ -641,7 +641,7 @@ For example, to set sequence number to the specified value $new_id: sub sequence_increment { my ($self, $args) = @_; - my $backup = sprintf("%s.%d.%d.%d.bak", + my $backup = sprintf("%s.%d.%d.%d.bak", $args->{ file }, time, $$, $Counter++); my $file = $args->{ file }; my $id = 0; @@ -810,7 +810,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/IO/Adapter/LDAP.pm b/fml/lib/IO/Adapter/LDAP.pm index e223e6cc..c4cca91a 100644 --- a/fml/lib/IO/Adapter/LDAP.pm +++ b/fml/lib/IO/Adapter/LDAP.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2005 Ken'ichi Fukamachi +# Copyright (C) 2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML$ +# $FML: LDAP.pm,v 1.16 2005/08/23 08:42:42 fukachan Exp $ # package IO::Adapter::LDAP; @@ -75,7 +75,7 @@ sub open for my $host (@servers) { my $ldap = Net::LDAP->new( $host ) or $self->error_set($@); if (defined $ldap) { - $self->{ _ldap } = $ldap; + $self->{ _ldap } = $ldap; my $mesg = $ldap->bind($root, password => $password); $mesg->code && $self->error_set($mesg->error); return $mesg; @@ -292,13 +292,13 @@ sub _fetch_all my $attr = $config->{ "ldap_query_${mode}_result_attribute" }; my $filter = $config->{ "ldap_query_${mode}_search_filter" }; - my $mesg = $ldap->search(base => $root, + my $mesg = $ldap->search(base => $root, filter => $filter, attrs => [ $attr ] ); - $mesg->code && $self->error_set($mesg->error); + $mesg->code && $self->error_set($mesg->error); my $a = []; - for my $entry ($mesg->entries) { + for my $entry ($mesg->entries) { my $r = $entry->get_value($attr, asref => 1) || []; push(@$a, @$r); } @@ -435,7 +435,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2005 Ken'ichi Fukamachi +Copyright (C) 2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/IO/Adapter/PCRE.pm b/fml/lib/IO/Adapter/PCRE.pm index 131878cc..5a440ba5 100644 --- a/fml/lib/IO/Adapter/PCRE.pm +++ b/fml/lib/IO/Adapter/PCRE.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2005 Ken'ichi Fukamachi +# Copyright (C) 2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: PCRE.pm,v 1.1 2005/12/08 10:05:58 fukachan Exp $ +# $FML: PCRE.pm,v 1.2 2005/12/11 13:10:25 fukachan Exp $ # package IO::Adapter::PCRE; @@ -18,7 +18,7 @@ use IO::Adapter::ErrorStatus qw(error_set error error_clear); my $debug = 0; use IO::Adapter::File; -push(@ISA, 'IO::Adapter::File'); +push(@ISA, 'IO::Adapter::File'); =head1 NAME @@ -158,7 +158,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2005 Ken'ichi Fukamachi +Copyright (C) 2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/Mail/Delivery/Queue.pm b/fml/lib/Mail/Delivery/Queue.pm index 49e85f80..3474d175 100644 --- a/fml/lib/Mail/Delivery/Queue.pm +++ b/fml/lib/Mail/Delivery/Queue.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Queue.pm,v 1.54 2005/08/19 12:17:12 fukachan Exp $ +# $FML: Queue.pm,v 1.55 2005/12/18 11:39:37 fukachan Exp $ # package Mail::Delivery::Queue; @@ -121,7 +121,7 @@ sub new my $files = []; push(@$files, $qf_new); $me->{ _cleanup_files } = $files; - + return bless $me, $type; } @@ -154,7 +154,7 @@ sub _new_queue_id $Counter++; my $id = sprintf("%d.%d.%d", time, $$, $Counter); - eval q{ + eval q{ use Time::HiRes qw(usleep gettimeofday); ($seconds, $microseconds) = gettimeofday; }; @@ -320,7 +320,7 @@ sub _list_ordered_by_policy # create hash { TIME_SLICE => [ qid1, qid2, ... ] } $queue_hash = {}; for my $q (@$list) { - if ($q =~ /^(\d+)/o) { + if ($q =~ /^(\d+)/o) { my $t = int( $1 / 87400 ); $qlist = $queue_hash->{ $t } || []; push(@$qlist, $q); @@ -400,7 +400,7 @@ sub update_schedule my $id = $policy_args->{ queue_id } || $self->id(); my $qf_deferred = $self->deferred_file_path($id); - # get hints. + # get hints. my $hints = $self->_update_schedule_info($id); my $sleep = $hints->{ sleep } || 300; my $time = time + $sleep; @@ -463,7 +463,7 @@ sub sleep_queue } -# Descriptions: change mode. +# Descriptions: change mode. # move active queue to deferred one, vice versa. # Arguments: OBJ($self) STR($id) STR($to_mode) # Side Effects: update queue. @@ -477,7 +477,7 @@ sub _change_queue_mode if ($self->lock()) { my $qf_deferred = $self->deferred_file_path($id); my $qf_active = $self->active_file_path($id); - my $qstr_args = { + my $qstr_args = { queue_id => $id, }; @@ -636,7 +636,7 @@ sub last_modified_time use File::stat; for my $class (@class_list, @local_class_list) { my $fp = sprintf("%s_file_path", $class); - my $file = $self->can($fp) ? $self->$fp($id) : + my $file = $self->can($fp) ? $self->$fp($id) : $self->local_file_path($class, $id); if (-f $file) { @@ -980,7 +980,7 @@ sub remove my $removed = 0; for my $class (@class_list, @local_class_list) { my $fp = sprintf("%s_file_path", $class); - my $f = $self->can($fp) ? $self->$fp($id) : + my $f = $self->can($fp) ? $self->$fp($id) : $self->local_file_path($class, $id); if (-f $f) { @@ -1039,13 +1039,13 @@ sub is_valid_queue my $qf_deferred = $self->deferred_file_path($id); my $qf_sender = $self->sender_file_path($id); my $qf_recipients = $self->recipients_file_path($id); - + for my $f ($qf_sender, $qf_recipients) { $ok++ if -f $f && -s $f; } # XXX You need lock() before calling is_valid_*_queue() method. - # + # # if "-s $qf_active ; rename() in some other process; -s $qf_deferred" # operation is done, this check fails. # make this check more robust, check again. @@ -1152,7 +1152,7 @@ sub close { my ($self, $class) = @_; my $channel = $self->{ "_${class}_channel" } || undef; - + if (defined $channel) { close($channel); } @@ -1605,7 +1605,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/Mail/Message.pm b/fml/lib/Mail/Message.pm index 2cd47a62..a287c3f3 100644 --- a/fml/lib/Mail/Message.pm +++ b/fml/lib/Mail/Message.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Message.pm,v 1.102 2005/09/02 09:12:17 fukachan Exp $ +# $FML: Message.pm,v 1.103 2005/09/11 13:12:45 fukachan Exp $ # package Mail::Message; @@ -719,7 +719,7 @@ sub __build_simple_message my $my_charset = $self->charset(); my $charset = $data->{ charset } || 'unknown'; my $type = $data->{ type } || 'unknown'; - my $buf = $data->{ data } || ''; + my $buf = $data->{ data } || ''; $my_charset =~ tr/A-Z/a-z/; $charset =~ tr/A-Z/a-z/; @@ -2868,7 +2868,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/Mail/Message/DB.pm b/fml/lib/Mail/Message/DB.pm index e4e2a0d6..84d177e6 100644 --- a/fml/lib/Mail/Message/DB.pm +++ b/fml/lib/Mail/Message/DB.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: DB.pm,v 1.26 2005/08/27 14:47:00 fukachan Exp $ +# $FML: DB.pm,v 1.27 2005/08/31 03:47:47 fukachan Exp $ # package Mail::Message::DB; @@ -21,7 +21,7 @@ use vars qw(@ISA @EXPORT @EXPORT_OK $AUTOLOAD use Carp; use File::Spec; -my $version = q$FML: DB.pm,v 1.26 2005/08/27 14:47:00 fukachan Exp $; +my $version = q$FML: DB.pm,v 1.27 2005/08/31 03:47:47 fukachan Exp $; if ($version =~ /,v\s+([\d\.]+)\s+/) { $version = $1;} # special value @@ -165,7 +165,7 @@ the full mail address such as C<elena@fml.org> since fml8 uses different $db_base_dir for each domain. For example, this module creates/updates the following databases (e.g. -/$db_base_dir/$db_name/$table.db where $table is 'article', +/$db_base_dir/$db_name/$table.db where $table is 'article', 'message_id', 'sender', et.al.). /var/spool/ml/@udb@/thread/elena/articles.db @@ -445,7 +445,7 @@ sub _analyze_thread } # III. if $idp (link to the previous message) found, - # update prev_key (itself to preious) and + # update prev_key (itself to preious) and # next_key (previous to itself) database. if (defined($idp) && $idp && $idp =~ /^\d+$/o) { if ($idp != $current_key) { @@ -987,7 +987,7 @@ sub _get_time_from_header sub open { my ($self, $args) = @_; - $self->_db_open($args); + $self->_db_open($args); } @@ -998,7 +998,7 @@ sub open sub close { my ($self, $args) = @_; - $self->_db_open($args); + $self->_db_open($args); } @@ -1494,7 +1494,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/fml/lib/Tie/JournaledDir.pm b/fml/lib/Tie/JournaledDir.pm index 2f1add2b..96657152 100644 --- a/fml/lib/Tie/JournaledDir.pm +++ b/fml/lib/Tie/JournaledDir.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: JournaledDir.pm,v 1.25 2004/07/23 15:59:16 fukachan Exp $ +# $FML: JournaledDir.pm,v 1.26 2005/05/27 04:30:23 fukachan Exp $ # package Tie::JournaledDir; @@ -228,7 +228,7 @@ sub FETCH FILE: for my $f (@$files) { if (-f $f) { - # XXX the file list is already in reverse order + # XXX the file list is already in reverse order # XXX since we nned to do last match in the latest file. my $obj = new Tie::JournaledFile { 'match_condition' => 'last', @@ -456,7 +456,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004,2005 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. |