diff options
| author | fukachan <fukachan> | 2003-10-15 01:03:27 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2003-10-15 01:03:27 +0000 |
| commit | 1b370892c9c5af0aabda61cd7ff1d6c15347b902 (patch) | |
| tree | b466798f77bf17af818809b01ecff765360cc7ec /fml | |
| parent | c086a07a0e8e7e88e77e3a75d2174dac70bf1e12 (diff) | |
| download | fml8-1b370892c9c5af0aabda61cd7ff1d6c15347b902.tar.gz fml8-1b370892c9c5af0aabda61cd7ff1d6c15347b902.tar.bz2 fml8-1b370892c9c5af0aabda61cd7ff1d6c15347b902.zip | |
space cosmetics
Diffstat (limited to 'fml')
28 files changed, 99 insertions, 99 deletions
diff --git a/fml/lib/FML/CGI/ML.pm b/fml/lib/FML/CGI/ML.pm index 23dc919b..ad5afa3d 100644 --- a/fml/lib/FML/CGI/ML.pm +++ b/fml/lib/FML/CGI/ML.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: ML.pm,v 1.3 2003/09/27 04:07:27 fukachan Exp $ +# $FML: ML.pm,v 1.4 2003/10/14 10:55:27 fukachan Exp $ # package FML::CGI::ML; @@ -47,7 +47,7 @@ sub cgi_menu unless ($curproc->cgi_var_cgi_mode() eq "admin") { croak("Admin::ML::cgi_menu: prohibited in this mode"); - } + } print start_form(-action=>$action, -target=>$target); print $curproc->cgi_hidden_info_language(); diff --git a/fml/lib/FML/Command/Admin/newml.pm b/fml/lib/FML/Command/Admin/newml.pm index b6de197d..43299f43 100644 --- a/fml/lib/FML/Command/Admin/newml.pm +++ b/fml/lib/FML/Command/Admin/newml.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: newml.pm,v 1.70 2003/09/25 11:40:59 fukachan Exp $ +# $FML: newml.pm,v 1.71 2003/09/27 03:00:15 fukachan Exp $ # package FML::Command::Admin::newml; @@ -108,7 +108,7 @@ sub process # already exists. unless (defined $options->{ force } ) { if (-d $ml_home_dir) { - warn("$ml_name ml_home_dir($ml_home_dir) already exists"); + warn("$ml_name ml_home_dir($ml_home_dir) already exists"); return ; } } @@ -143,18 +143,18 @@ sub process # Descriptions: generate _ml_name_xxx in $params -# Arguments: OBJ($self) +# Arguments: OBJ($self) # OBJ($curproc) HASH_REF($command_args) HASH_REF($params) # Side Effects: update $params # Return Value: none sub _adjust_params_for_virtual_domain { my ($self, $curproc, $command_args, $params) = @_; - my ($ml_name_admin, $ml_name_ctl, $ml_name_error, + my ($ml_name_admin, $ml_name_ctl, $ml_name_error, $ml_name_post,$ml_name_request); my $ml_name = $params->{ _ml_name }; my $ml_domain = $params->{ ml_domain }; - + if ($curproc->is_default_domain($ml_domain)) { $ml_name_admin = sprintf("%s-%s",$ml_name,"admin",$ml_domain); $ml_name_ctl = sprintf("%s-%s",$ml_name,"ctl",$ml_domain); @@ -428,9 +428,9 @@ sub _setup_cgi_interface _install($src, $dst, $params); } - # + # # 3. install *.cgi - # + # use File::Spec; my $libexec_dir = $config->{ fml_libexec_dir }; diff --git a/fml/lib/FML/Command/Admin/rmml.pm b/fml/lib/FML/Command/Admin/rmml.pm index 2c05a20f..dd518848 100644 --- a/fml/lib/FML/Command/Admin/rmml.pm +++ b/fml/lib/FML/Command/Admin/rmml.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: rmml.pm,v 1.19 2003/09/13 09:16:59 fukachan Exp $ +# $FML: rmml.pm,v 1.20 2003/09/27 03:00:16 fukachan Exp $ # package FML::Command::Admin::rmml; @@ -118,7 +118,7 @@ sub _remove_ml_home_dir $curproc->ui_message("removing ml_home_dir for $ml_name"); # /var/spool/ml/elena -> /var/spool/ml/@elena - my $removed_dir = + my $removed_dir = $curproc->removed_ml_home_dir_path($ml_home_prefix, $ml_name); rename($ml_home_dir, $removed_dir); diff --git a/fml/lib/FML/Command/SendFile.pm b/fml/lib/FML/Command/SendFile.pm index 57dde5b8..18f032e6 100644 --- a/fml/lib/FML/Command/SendFile.pm +++ b/fml/lib/FML/Command/SendFile.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: SendFile.pm,v 1.31 2003/08/29 15:33:57 fukachan Exp $ +# $FML: SendFile.pm,v 1.32 2003/10/14 12:57:44 fukachan Exp $ # package FML::Command::SendFile; @@ -56,7 +56,7 @@ sub num_files_in_send_article_args { my ($self, $curproc, $command_args) = @_; my $command = $command_args->{ command }; - my $count = 0; + my $count = 0; # command buffer = get 1 # command buffer = get 1,2,3 diff --git a/fml/lib/FML/Command/User/get.pm b/fml/lib/FML/Command/User/get.pm index f787292d..1b4f8c12 100644 --- a/fml/lib/FML/Command/User/get.pm +++ b/fml/lib/FML/Command/User/get.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: get.pm,v 1.17 2003/06/29 05:48:12 fukachan Exp $ +# $FML: get.pm,v 1.18 2003/08/23 07:24:44 fukachan Exp $ # package FML::Command::User::get; @@ -98,7 +98,7 @@ sub check_limit 'requests exceed limit', $_args); $curproc->logerror("get command limit: $nreq > $limit"); - return $nreq; + return $nreq; } else { return 0; diff --git a/fml/lib/FML/Error.pm b/fml/lib/FML/Error.pm index 27398bdd..476fc621 100644 --- a/fml/lib/FML/Error.pm +++ b/fml/lib/FML/Error.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Error.pm,v 1.24 2003/08/23 14:37:58 fukachan Exp $ +# $FML: Error.pm,v 1.25 2003/08/29 15:33:54 fukachan Exp $ # package FML::Error; @@ -182,7 +182,7 @@ sub add my ($self, $info) = @_; my $curproc = $self->{ _curproc }; my $db = $self->{ _db }; - my $addr = $info->{ address }; + my $addr = $info->{ address }; if (defined $db) { $self->lock(); diff --git a/fml/lib/FML/Error/Analyze.pm b/fml/lib/FML/Error/Analyze.pm index 8f9d85b9..6a43dced 100644 --- a/fml/lib/FML/Error/Analyze.pm +++ b/fml/lib/FML/Error/Analyze.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: Analyze.pm,v 1.22 2003/08/23 04:35:34 fukachan Exp $ +# $FML: Analyze.pm,v 1.23 2003/08/23 07:24:44 fukachan Exp $ # package FML::Error::Analyze; @@ -53,7 +53,7 @@ return summary of points of addresses as HASH_REF. $summary = { address1 => point, - address2 => point, + address2 => point, }; =head2 removal_address() @@ -63,7 +63,7 @@ return addresses to be removed. =cut -# Descriptions: return summary +# Descriptions: return summary # Arguments: OBJ($self) # Side Effects: none # Return Value: HASH_REF @@ -89,7 +89,7 @@ sub removal_address { my ($self) = @_; my $analyzer = $self->{ _analyzer }; - + if (defined $analyzer) { return $analyzer->removal_address(); } @@ -107,7 +107,7 @@ sub print { my ($self, $addr) = @_; my $analyzer = $self->{ _analyzer }; - + if (defined $analyzer) { return $analyzer->print($addr); } @@ -162,7 +162,7 @@ sub AUTOLOAD =head1 $data STRUCTURE -C<$data> is passed to the error analyer function +C<$data> is passed to the error analyer function C<FML::Error::Analyze::${fp}> (as $anal_args in AUTOLOAD()). $data = { diff --git a/fml/lib/FML/Error/Analyze/histgram.pm b/fml/lib/FML/Error/Analyze/histgram.pm index 41304f77..1a704369 100644 --- a/fml/lib/FML/Error/Analyze/histgram.pm +++ b/fml/lib/FML/Error/Analyze/histgram.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: histgram.pm,v 1.3 2003/08/23 04:35:35 fukachan Exp $ +# $FML: histgram.pm,v 1.4 2003/08/23 07:24:45 fukachan Exp $ # package FML::Error::Analyze::histgram; @@ -220,7 +220,7 @@ sub print my $y = ''; for my $y (@$bufarray) { - $x .= defined $y ? $y : 0; + $x .= defined $y ? $y : 0; $x .= " "; } diff --git a/fml/lib/FML/Error/Analyze/simple_count.pm b/fml/lib/FML/Error/Analyze/simple_count.pm index 5721395a..55757b33 100644 --- a/fml/lib/FML/Error/Analyze/simple_count.pm +++ b/fml/lib/FML/Error/Analyze/simple_count.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: simple_count.pm,v 1.2 2003/05/28 14:33:44 fukachan Exp $ +# $FML: simple_count.pm,v 1.3 2003/08/23 04:35:35 fukachan Exp $ # package FML::Error::Analyze::simple_count; @@ -14,7 +14,7 @@ use Carp; use FML::Log qw(Log LogWarn LogError); my $debug = 1; - + =head1 NAME diff --git a/fml/lib/FML/Error/Cache.pm b/fml/lib/FML/Error/Cache.pm index 5d78aa80..0abab348 100644 --- a/fml/lib/FML/Error/Cache.pm +++ b/fml/lib/FML/Error/Cache.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Cache.pm,v 1.13 2003/08/23 14:38:00 fukachan Exp $ +# $FML: Cache.pm,v 1.14 2003/08/29 15:34:03 fukachan Exp $ # package FML::Error::Cache; @@ -97,7 +97,7 @@ sub close { 1;} sub touch { 1;} -=head2 add($address, $argv) +=head2 add($address, $argv) add data given as hash reference $argv. diff --git a/fml/lib/FML/Filter.pm b/fml/lib/FML/Filter.pm index cb040479..c9c7438d 100644 --- a/fml/lib/FML/Filter.pm +++ b/fml/lib/FML/Filter.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: Filter.pm,v 1.34 2003/08/23 14:37:58 fukachan Exp $ +# $FML: Filter.pm,v 1.35 2003/09/20 13:43:29 fukachan Exp $ # package FML::Filter; @@ -310,7 +310,7 @@ sub _filter_reject_notice my $config = $curproc->config(); my $msg = $curproc->incoming_message(); my $r = $msg_args->{ _arg_reason } || 'unknown'; - my $type = $config->{ "${class}_filter_reject_notice_data_type" } || + my $type = $config->{ "${class}_filter_reject_notice_data_type" } || 'string'; my $size = 2048; @@ -337,9 +337,9 @@ sub _filter_reject_notice $curproc->reply_message($msg, $msg_args); } elsif ($type eq 'string') { - my $s = $msg->whole_message_as_str( { - indent => ' ', - size => $size, + my $s = $msg->whole_message_as_str( { + indent => ' ', + size => $size, }); my $r = "The first $size bytes of this message follows:"; $curproc->reply_message_nl("error.reject_notice_preamble", @@ -368,7 +368,7 @@ sub command_mail_filter my $config = $curproc->config(); if (defined $message) { - my $functions = + my $functions = $config->get_as_array_ref('command_mail_filter_functions'); my $status = 0; @@ -409,7 +409,7 @@ sub _apply_command_mail_size_filter $obj->set_class('incoming_command_mail'); # overwrite filter rules based on FML::Config - my $rules = + my $rules = $config->get_as_array_ref('command_mail_size_filter_rules'); # overwrite rules diff --git a/fml/lib/FML/Filter/MimeComponent.pm b/fml/lib/FML/Filter/MimeComponent.pm index 182a0b9a..d9a90efe 100644 --- a/fml/lib/FML/Filter/MimeComponent.pm +++ b/fml/lib/FML/Filter/MimeComponent.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: MimeComponent.pm,v 1.4 2003/09/20 13:43:31 fukachan Exp $ +# $FML: MimeComponent.pm,v 1.5 2003/10/14 10:44:08 fukachan Exp $ # package FML::Filter::MimeComponent; @@ -69,7 +69,7 @@ sub new my ($type) = ref($self) || $self; my %count = (); my %reason = (); - my $me = { + my $me = { _curproc => $curproc, _count => \%count, _reason => \%reason, @@ -274,7 +274,7 @@ sub mime_component_check # save the reason(s). for my $key (keys %$reason) { if ($key ne 'reject') { - $_reason .= + $_reason .= $_reason ? " + ".$reason->{ $key } : $reason->{ $key }; } @@ -283,7 +283,7 @@ sub mime_component_check } } } - + $_reason ||= $self->{ _reject_reason } || "default action"; if (defined $curproc) { $curproc->log("mime_component_filter: $decision ($_reason)"); @@ -392,7 +392,7 @@ sub __basic_regexp_match return 0; } } - + return 0; } diff --git a/fml/lib/FML/Filter/Size.pm b/fml/lib/FML/Filter/Size.pm index caa71986..b3e956af 100644 --- a/fml/lib/FML/Filter/Size.pm +++ b/fml/lib/FML/Filter/Size.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: Size.pm,v 1.3 2003/07/21 04:51:33 fukachan Exp $ +# $FML: Size.pm,v 1.4 2003/08/23 04:35:36 fukachan Exp $ # package FML::Filter::Size; @@ -87,7 +87,7 @@ set class e.g. incoming_article, outgoing_article, ... =cut -# Descriptions: set class. +# Descriptions: set class. # Arguments: OBJ($self) STR($class) # Side Effects: update $self->{ _class } # Return Value: STR diff --git a/fml/lib/FML/IPC/Queue.pm b/fml/lib/FML/IPC/Queue.pm index 1301426b..ba0ea12c 100644 --- a/fml/lib/FML/IPC/Queue.pm +++ b/fml/lib/FML/IPC/Queue.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: @template.pm,v 1.7 2003/01/01 02:06:22 fukachan Exp $ +# $FML: Queue.pm,v 1.1 2003/08/30 00:14:44 fukachan Exp $ # package FML::IPC::Queue; @@ -28,8 +28,8 @@ FML::IPC::Queue - basic message queue operation =head1 DESCRIPTION -FML::IPC::Queue provides basic message queue operations such as -appending messages into the queue, +FML::IPC::Queue provides basic message queue operations such as +appending messages into the queue, list up queue et.al. =head1 METHODS @@ -43,7 +43,7 @@ list up queue et.al. # Descriptions: constructor. # Arguments: OBJ($self) HASH_REF($args) -# Side Effects: create an object +# Side Effects: create an object # Return Value: OBJ sub new { diff --git a/fml/lib/FML/MTAControl/Qmail.pm b/fml/lib/FML/MTAControl/Qmail.pm index 17b933d9..4f18a5e1 100644 --- a/fml/lib/FML/MTAControl/Qmail.pm +++ b/fml/lib/FML/MTAControl/Qmail.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Qmail.pm,v 1.17 2003/08/29 15:34:05 fukachan Exp $ +# $FML: Qmail.pm,v 1.18 2003/09/13 09:17:00 fukachan Exp $ # package FML::MTAControl::Qmail; @@ -74,7 +74,7 @@ sub qmail_remove_alias unlink $dst || do { my $s = "failed to remove $dst"; $curproc->ui_message("error: $s"); - $curproc->logerror($s); + $curproc->logerror($s); }; } } diff --git a/fml/lib/FML/Process/CGI/Kernel.pm b/fml/lib/FML/Process/CGI/Kernel.pm index 4ae9c8d2..9af95058 100644 --- a/fml/lib/FML/Process/CGI/Kernel.pm +++ b/fml/lib/FML/Process/CGI/Kernel.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Kernel.pm,v 1.59 2003/10/14 10:55:26 fukachan Exp $ +# $FML: Kernel.pm,v 1.60 2003/10/15 00:29:36 fukachan Exp $ # package FML::Process::CGI::Kernel; @@ -119,7 +119,7 @@ sub _set_charset $curproc->set_charset("template_file", 'us-ascii'); } else { - $curproc->set_charset("template_file", 'us-ascii'); + $curproc->set_charset("template_file", 'us-ascii'); } } diff --git a/fml/lib/FML/Process/CGI/Utils.pm b/fml/lib/FML/Process/CGI/Utils.pm index 3a6539e4..899a0cd7 100644 --- a/fml/lib/FML/Process/CGI/Utils.pm +++ b/fml/lib/FML/Process/CGI/Utils.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Utils.pm,v 1.3 2003/09/27 06:57:00 fukachan Exp $ +# $FML: Utils.pm,v 1.4 2003/10/14 07:04:35 fukachan Exp $ # package FML::Process::CGI::Utils; @@ -45,7 +45,7 @@ sub cgi_var_ml_name # Descriptions: return $ml_domain defined in *.cgi programd . -# ml_domain is hard-coded, not dependent on cgi_var_cgi_mode. +# ml_domain is hard-coded, not dependent on cgi_var_cgi_mode. # Arguments: OBJ($curproc) # Side Effects: none # Return Value: STR @@ -58,8 +58,8 @@ sub cgi_var_ml_domain # Descriptions: return $ml_home_prefix defined in *.cgi program. -# ml_home_prefix is determined by ml_domain, -# which is hard-coded, not dependent on cgi_var_cgi_mode. +# ml_home_prefix is determined by ml_domain, +# which is hard-coded, not dependent on cgi_var_cgi_mode. # Arguments: OBJ($curproc) # Side Effects: none # Return Value: STR diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm index 8b6b6638..22fe7f44 100644 --- a/fml/lib/FML/Process/Distribute.pm +++ b/fml/lib/FML/Process/Distribute.pm @@ -3,7 +3,7 @@ # Copyright (C) 2000,2001,2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Distribute.pm,v 1.126 2003/09/29 13:06:54 fukachan Exp $ +# $FML: Distribute.pm,v 1.127 2003/10/06 10:42:18 fukachan Exp $ # package FML::Process::Distribute; @@ -197,13 +197,13 @@ sub run my $config = $curproc->config(); my $maintainer = $config->{ maintainer }; my $sender = $curproc->{'credential'}->{'sender'}; - my $data_type = + my $data_type = $config->{post_restrictions_reject_notice_data_type} || 'string'; my $size = 2048; my $msg_args = { recipient => $sender, _arg_address => $sender, - _arg_size => $size, + _arg_size => $size, }; my $eval = $config->get_hook( 'distribute_run_start_hook' ); @@ -222,7 +222,7 @@ sub run my $rule = $pcb->get("check_restrictions", "deny_reason"); if ($rule eq 'reject_system_accounts') { my $r = "deny request from a system account"; - $curproc->reply_message_nl("error.system_accounts", + $curproc->reply_message_nl("error.system_accounts", $r, $msg_args); } elsif ($rule eq 'permit_member_maps') { @@ -241,7 +241,7 @@ sub run # send back deny request with the original message. my $msg = $curproc->incoming_message(); if ($data_type eq 'string') { - my $s = $msg->whole_message_as_str( { + my $s = $msg->whole_message_as_str( { indent => ' ', size => $size, } ); @@ -580,7 +580,7 @@ sub _new_thread_check $thread->analyze($msg); # get summary based on updated UDB. - # XXX mode = html or text + # XXX mode = html or text } diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm index 98018260..3c53875e 100644 --- a/fml/lib/FML/Process/Kernel.pm +++ b/fml/lib/FML/Process/Kernel.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Kernel.pm,v 1.184 2003/10/14 06:58:10 fukachan Exp $ +# $FML: Kernel.pm,v 1.185 2003/10/14 12:57:45 fukachan Exp $ # package FML::Process::Kernel; @@ -1195,10 +1195,10 @@ sub log_message my $at_function = $msg_args->{ caller }->[ 1 ]; my $at_line = $msg_args->{ caller }->[ 2 ]; - if ($level eq 'info') { + if ($level eq 'info') { Log($msg); } - elsif ($level eq 'warn') { + elsif ($level eq 'warn') { LogWarn($msg); } elsif ($level eq 'error') { @@ -1679,7 +1679,7 @@ sub message_nl my $buf = ''; use File::Spec; - $class =~ s@\.@/@g; # XXX . -> / + $class =~ s@\.@/@g; # XXX . -> / my $local_file = File::Spec->catfile($local_dir, $charset, $class); my $file = File::Spec->catfile($dir, $charset, $class); @@ -2331,7 +2331,7 @@ sub parse_exception sub _reopen_stderr_channel { my ($curproc) = @_; - my $config = $curproc->config(); + my $config = $curproc->config(); my $option = $curproc->command_line_options(); if ($curproc->is_cgi_process() || diff --git a/fml/lib/FML/Process/Switch.pm b/fml/lib/FML/Process/Switch.pm index 473a7b08..7abd1416 100644 --- a/fml/lib/FML/Process/Switch.pm +++ b/fml/lib/FML/Process/Switch.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: Switch.pm,v 1.98 2003/09/20 04:32:51 fukachan Exp $ +# $FML: Switch.pm,v 1.99 2003/09/27 14:56:48 fukachan Exp $ # package FML::Process::Switch; @@ -460,7 +460,7 @@ sub _program_match else { return _program_subdir_match($program, $name, $fullname); } - } + } else { return _program_subdir_match($program, $name, $fullname); } diff --git a/fml/lib/FML/Process/Utils.pm b/fml/lib/FML/Process/Utils.pm index 4fd8b5a0..993a0270 100644 --- a/fml/lib/FML/Process/Utils.pm +++ b/fml/lib/FML/Process/Utils.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Utils.pm,v 1.81 2003/09/25 11:36:25 fukachan Exp $ +# $FML: Utils.pm,v 1.82 2003/10/14 12:57:46 fukachan Exp $ # package FML::Process::Utils; @@ -1404,7 +1404,7 @@ sub language_of_html_file # Return Value: none sub set_charset { - my ($curproc, $category, $charset) = @_; + my ($curproc, $category, $charset) = @_; my $pcb = $curproc->pcb(); $pcb->set("charset", $category, $charset); @@ -1418,7 +1418,7 @@ sub set_charset # Return Value: STR sub get_charset { - my ($curproc, $category) = @_; + my ($curproc, $category) = @_; my $config = $curproc->config(); my $pcb = $curproc->pcb(); my $category = $category || "template_file"; diff --git a/fml/lib/FML/Restriction/Base.pm b/fml/lib/FML/Restriction/Base.pm index 58c7eb21..18948b63 100644 --- a/fml/lib/FML/Restriction/Base.pm +++ b/fml/lib/FML/Restriction/Base.pm @@ -3,7 +3,7 @@ # Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi # All rights reserved. # -# $FML: Base.pm,v 1.23 2003/08/23 04:35:41 fukachan Exp $ +# $FML: Base.pm,v 1.24 2003/09/30 14:27:09 fukachan Exp $ # package FML::Restriction::Base; @@ -120,7 +120,7 @@ my %basic_variable = 'command_line_options' => $option_regexp, # misc - 'language' => $option_regexp, + 'language' => $option_regexp, ); diff --git a/fml/lib/Mail/Bounce/Freeserve.pm b/fml/lib/Mail/Bounce/Freeserve.pm index 44be7561..cc2e19fd 100644 --- a/fml/lib/Mail/Bounce/Freeserve.pm +++ b/fml/lib/Mail/Bounce/Freeserve.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: Freeserve.pm,v 1.2 2003/08/06 11:20:04 fukachan Exp $ +# $FML: Freeserve.pm,v 1.3 2003/08/06 14:13:41 tmu Exp $ # # @@ -45,7 +45,7 @@ See C<Mail::Bounce> for more details. X-Loop contains the address which causes this error. See L<Mail::Bounce::Language::Japanese> module for the Japanese -message. +message. =cut diff --git a/fml/lib/Mail/Delivery/Queue.pm b/fml/lib/Mail/Delivery/Queue.pm index c7e69a4d..5d3c8278 100644 --- a/fml/lib/Mail/Delivery/Queue.pm +++ b/fml/lib/Mail/Delivery/Queue.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: Queue.pm,v 1.25 2003/04/15 01:52:18 fukachan Exp $ +# $FML: Queue.pm,v 1.26 2003/08/23 04:35:45 fukachan Exp $ # package Mail::Delivery::Queue; @@ -315,7 +315,7 @@ sub lock flock($fh, &LOCK_EX); $self->{ _lock }->{ _fh } = $fh; }; - alarm(0); + alarm(0); ($@ =~ /lock timeout/) ? 0 : 1; } diff --git a/fml/lib/Mail/Message.pm b/fml/lib/Mail/Message.pm index 1186d908..6c2c8d18 100644 --- a/fml/lib/Mail/Message.pm +++ b/fml/lib/Mail/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: Message.pm,v 1.84 2003/09/08 09:30:09 fukachan Exp $ +# $FML: Message.pm,v 1.85 2003/09/13 13:01:01 fukachan Exp $ # package Mail::Message; @@ -722,7 +722,7 @@ sub whole_message_body =head2 whole_message_as_str($args) -To extract the first 2048 bytes in the whole message (body), +To extract the first 2048 bytes in the whole message (body), specify the following parameters in $args. $args = { @@ -793,7 +793,7 @@ sub _fuzzy_substr if ($p <= $max) { return substr($$r_data, $start, $p - $start); - } + } else { my ($last_p, $i); $i = 10; @@ -802,7 +802,7 @@ sub _fuzzy_substr PAR: while ($i-- > 0) { $p = index($$r_data, "\n\n", $p + 1); - last PAR if $p > $max; + last PAR if $p > $max; $last_p = $p; } @@ -1421,7 +1421,7 @@ sub parse_and_build_mime_multipart_chain # 1. check the preamble before multipart blocks # XXX mpb = multipart-body - # + # # XXX-TODO: bug fix logic to find the start point of multipart. # 2003/08/16: modify $mpb_begin search logic, # which is effective but wrong. @@ -1490,7 +1490,7 @@ sub parse_and_build_mime_multipart_chain # XXX We need Content-Type: in each block. This may be a bug ? # XXX To avoid the first part without no content-type, we check # XXX the first string in the body data. - # + # # XXX The first delimeter should be handled specially. # XXX Exactly, it is dash-boundary not delimeter! my $dp = index($$data, $dash_boundary, 0); # ^dash-boundary diff --git a/fml/lib/Mail/Message/DB.pm b/fml/lib/Mail/Message/DB.pm index 0efe8f14..8be33314 100644 --- a/fml/lib/Mail/Message/DB.pm +++ b/fml/lib/Mail/Message/DB.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: DB.pm,v 1.9 2003/10/06 10:42:19 fukachan Exp $ +# $FML: DB.pm,v 1.10 2003/10/14 10:06:08 fukachan Exp $ # package Mail::Message::DB; @@ -26,7 +26,7 @@ use lib qw(../../../../fml/lib ../../../../img/lib ); -my $version = q$FML: DB.pm,v 1.9 2003/10/06 10:42:19 fukachan Exp $; +my $version = q$FML: DB.pm,v 1.10 2003/10/14 10:06:08 fukachan Exp $; if ($version =~ /,v\s+([\d\.]+)\s+/) { $version = $1;} # special value @@ -203,7 +203,7 @@ sub new push(@orig_header_fields, "orig_$hdr"); push(@article_header_fields, "article_$hdr"); } - + return bless $me, $type; } @@ -321,7 +321,7 @@ sub _save_header_info $val =~ s/\s*$//; $self->_db_set($db, "orig_$key", $id, $val); - + # ADDR type: save the first element of address list. if ($header_field_type{ $key } =~ /ADDR/) { # ADDR or ADDR_LIST my $ra_val = $self->_address_clean_up( $val ); @@ -745,7 +745,7 @@ sub _db_array_add $found = 1 if ($value =~ /^\d+$/o) && ($v == $value); $found = 1 if ($value !~ /^\d+$/o) && ($v eq $value); } - + # add if the value is a new comer. unless ($found) { my $v = $self->_db_get($db, $table, $key) || ''; @@ -880,11 +880,11 @@ sub db_open else { return $self->{ _db } if defined $self->{ _db }; - # @table = (@orig_header_fields, - # @header_fields, + # @table = (@orig_header_fields, + # @header_fields, # @article_header_fields, # @table_list); - @table = (@table_list); + @table = (@table_list); } _PRINT_DEBUG("db_open(on demand): @table"); diff --git a/fml/lib/Mail/Message/ToHTML.pm b/fml/lib/Mail/Message/ToHTML.pm index 8f1fcb1d..621fe4bd 100644 --- a/fml/lib/Mail/Message/ToHTML.pm +++ b/fml/lib/Mail/Message/ToHTML.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: ToHTML.pm,v 1.55 2003/09/08 09:21:51 fukachan Exp $ +# $FML: ToHTML.pm,v 1.56 2003/10/06 10:42:19 fukachan Exp $ # package Mail::Message::ToHTML; @@ -17,7 +17,7 @@ my $debug = 0; my $URL = "<A HREF=\"http://www.fml.org/software/\">Mail::Message::ToHTML</A>"; -my $version = q$FML: ToHTML.pm,v 1.55 2003/09/08 09:21:51 fukachan Exp $; +my $version = q$FML: ToHTML.pm,v 1.56 2003/10/06 10:42:19 fukachan Exp $; if ($version =~ /,v\s+([\d\.]+)\s+/) { $version = "$URL $1"; } @@ -119,7 +119,7 @@ sub new # Descriptions: destructor. # Arguments: OBJ($self) -# Side Effects: none +# Side Effects: none # Return Value: none sub DESTROY { @@ -490,7 +490,7 @@ sub html_begin elsif (defined $args->{ message }) { $msg = $args->{ message }; $hdr = $msg->whole_message_header; - $title = $self->_decode_mime_string( $hdr->get('article_subject') || + $title = $self->_decode_mime_string( $hdr->get('article_subject') || $hdr->get('subject') ); } @@ -1978,7 +1978,7 @@ sub _print_li_filename { my ($self, $wh, $db, $id, $code) = @_; my $filename = $db->get('html_filename', $id); - my $subject = $db->get('article_subject', $id) || + my $subject = $db->get('article_subject', $id) || $db->get('subject', $id) || "no subject"; my $who = $db->get('who', $id) || "no sender"; diff --git a/fml/lib/Tie/JournaledFile.pm b/fml/lib/Tie/JournaledFile.pm index 5bc9475e..8690b919 100644 --- a/fml/lib/Tie/JournaledFile.pm +++ b/fml/lib/Tie/JournaledFile.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: JournaledFile.pm,v 1.28 2003/02/01 08:48:09 fukachan Exp $ +# $FML: JournaledFile.pm,v 1.29 2003/07/21 09:40:31 fukachan Exp $ # package Tie::JournaledFile; @@ -45,8 +45,8 @@ By default, FETCH() returns the first value with the key. It meas first match. use Tie::JournaledFile; - tie %db, 'Tie::JournaledFile', { - match_condition => "first", + tie %db, 'Tie::JournaledFile', { + match_condition => "first", file => 'cache.txt', }; print $db{ rudo }, "\n"; |
