diff options
95 files changed, 932 insertions, 932 deletions
diff --git a/fml/lib/FML/Command/Admin/add.pm b/fml/lib/FML/Command/Admin/add.pm index 9e5608b1..d3e72482 100644 --- a/fml/lib/FML/Command/Admin/add.pm +++ b/fml/lib/FML/Command/Admin/add.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,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: add.pm,v 1.8 2002/09/22 14:56:43 fukachan Exp $ +# $FML: add.pm,v 1.9 2004/01/02 14:42:42 fukachan Exp $ # package FML::Command::Admin::add; @@ -18,13 +18,13 @@ use FML::Command::Admin::subscribe; # Descriptions: subscribe user -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to subscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +Copyright (C) 2001,2002,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/Command/Admin/add2active.pm b/fml/lib/FML/Command/Admin/add2active.pm index 5899c637..0273cdb6 100644 --- a/fml/lib/FML/Command/Admin/add2active.pm +++ b/fml/lib/FML/Command/Admin/add2active.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: add.pm,v 1.9 2004/01/02 14:42:42 fukachan Exp $ +# $FML: add2active.pm,v 1.1 2004/05/01 05:02:03 fukachan Exp $ # package FML::Command::Admin::add2active; @@ -18,13 +18,13 @@ use FML::Command::Admin::addrecipient; # Descriptions: add user as only recipient -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to addrecipient module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/add2actives.pm b/fml/lib/FML/Command/Admin/add2actives.pm index 9d7e673b..9ed74f53 100644 --- a/fml/lib/FML/Command/Admin/add2actives.pm +++ b/fml/lib/FML/Command/Admin/add2actives.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: add.pm,v 1.9 2004/01/02 14:42:42 fukachan Exp $ +# $FML: add2actives.pm,v 1.1 2004/05/01 05:02:03 fukachan Exp $ # package FML::Command::Admin::add2actives; @@ -18,13 +18,13 @@ use FML::Command::Admin::addrecipient; # Descriptions: add user as only recipient -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to addrecipient module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/add2member.pm b/fml/lib/FML/Command/Admin/add2member.pm index 05e81ba6..8b969b11 100644 --- a/fml/lib/FML/Command/Admin/add2member.pm +++ b/fml/lib/FML/Command/Admin/add2member.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: add.pm,v 1.9 2004/01/02 14:42:42 fukachan Exp $ +# $FML: add2member.pm,v 1.1 2004/05/01 05:02:03 fukachan Exp $ # package FML::Command::Admin::add2member; @@ -18,13 +18,13 @@ use FML::Command::Admin::addmember; # Descriptions: add user as only member -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to addmember module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/add2members.pm b/fml/lib/FML/Command/Admin/add2members.pm index 1111eb3f..f216f06e 100644 --- a/fml/lib/FML/Command/Admin/add2members.pm +++ b/fml/lib/FML/Command/Admin/add2members.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: add.pm,v 1.9 2004/01/02 14:42:42 fukachan Exp $ +# $FML: add2members.pm,v 1.1 2004/05/01 05:02:03 fukachan Exp $ # package FML::Command::Admin::add2members; @@ -18,13 +18,13 @@ use FML::Command::Admin::addmember; # Descriptions: add user as only member -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to addmember module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/add2recipient.pm b/fml/lib/FML/Command/Admin/add2recipient.pm index 070f159e..e09b1525 100644 --- a/fml/lib/FML/Command/Admin/add2recipient.pm +++ b/fml/lib/FML/Command/Admin/add2recipient.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: add.pm,v 1.9 2004/01/02 14:42:42 fukachan Exp $ +# $FML: add2recipient.pm,v 1.1 2004/05/01 05:02:03 fukachan Exp $ # package FML::Command::Admin::add2recipient; @@ -18,13 +18,13 @@ use FML::Command::Admin::addrecipient; # Descriptions: add user as only recipient -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to addrecipient module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/add2recipients.pm b/fml/lib/FML/Command/Admin/add2recipients.pm index 6f8ab199..b65dc861 100644 --- a/fml/lib/FML/Command/Admin/add2recipients.pm +++ b/fml/lib/FML/Command/Admin/add2recipients.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: add.pm,v 1.9 2004/01/02 14:42:42 fukachan Exp $ +# $FML: add2recipients.pm,v 1.1 2004/05/01 05:02:03 fukachan Exp $ # package FML::Command::Admin::add2recipients; @@ -18,13 +18,13 @@ use FML::Command::Admin::addrecipient; # Descriptions: add user as only recipient -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to addrecipient module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/addactive.pm b/fml/lib/FML/Command/Admin/addactive.pm index 93e4734d..b656ee96 100644 --- a/fml/lib/FML/Command/Admin/addactive.pm +++ b/fml/lib/FML/Command/Admin/addactive.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: add.pm,v 1.9 2004/01/02 14:42:42 fukachan Exp $ +# $FML: addactive.pm,v 1.1 2004/05/01 05:02:04 fukachan Exp $ # package FML::Command::Admin::addactive; @@ -18,13 +18,13 @@ use FML::Command::Admin::addrecipient; # Descriptions: add user as only recipient -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to addrecipient module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/addactives.pm b/fml/lib/FML/Command/Admin/addactives.pm index bc828b69..57e4a6dd 100644 --- a/fml/lib/FML/Command/Admin/addactives.pm +++ b/fml/lib/FML/Command/Admin/addactives.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: add.pm,v 1.9 2004/01/02 14:42:42 fukachan Exp $ +# $FML: addactives.pm,v 1.1 2004/05/01 05:02:04 fukachan Exp $ # package FML::Command::Admin::addactives; @@ -18,13 +18,13 @@ use FML::Command::Admin::addrecipient; # Descriptions: add user as only recipient -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to addrecipient module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/addadmin.pm b/fml/lib/FML/Command/Admin/addadmin.pm index 20ae36e6..2fed81d6 100644 --- a/fml/lib/FML/Command/Admin/addadmin.pm +++ b/fml/lib/FML/Command/Admin/addadmin.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: addadmin.pm,v 1.21 2005/08/17 10:36:35 fukachan Exp $ +# $FML: addadmin.pm,v 1.22 2005/08/17 12:08:42 fukachan Exp $ # package FML::Command::Admin::addadmin; @@ -27,7 +27,7 @@ add a new remote administrator mail address. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -60,29 +60,29 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: add a new remote administrator mail address. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update proper $member_map and $recipient_map. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); - my $options = $command_args->{ options }; - my $address = $command_args->{ command_data } || $options->[ 0 ]; + my $options = $command_context->get_options(); + my $address = $command_context->{ command_data } || $options->[ 0 ]; # XXX We should always add/rewrite only $primary_*_map maps via # XXX command mail, CUI and GUI. @@ -112,7 +112,7 @@ sub process eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_add($curproc, $command_args, $uc_args); + $obj->user_add($curproc, $command_context, $uc_args); }; if ($r = $@) { croak($r); @@ -121,18 +121,18 @@ sub process # Descriptions: cgi menu to add a new remote administrator. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -150,7 +150,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/Command/Admin/addmember.pm b/fml/lib/FML/Command/Admin/addmember.pm index 8da40bda..08bc37f8 100644 --- a/fml/lib/FML/Command/Admin/addmember.pm +++ b/fml/lib/FML/Command/Admin/addmember.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: addmember.pm,v 1.5 2005/08/17 12:08:45 fukachan Exp $ +# $FML: addmember.pm,v 1.6 2005/11/30 23:30:38 fukachan Exp $ # package FML::Command::Admin::addmember; @@ -27,7 +27,7 @@ change delivery mode from digest to real time. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -60,30 +60,30 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: change delivery mode from digest to real time. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); - my $options = $command_args->{ options }; - my $address = $command_args->{ command_data } || $options->[ 0 ]; + my $options = $command_context->get_options(); + my $address = $command_context->{ command_data } || $options->[ 0 ]; # XXX We should always add/rewrite only $primary_*_map maps via # XXX command mail, CUI and GUI. @@ -123,7 +123,7 @@ sub process eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_add($curproc, $command_args, $uc_args); + $obj->user_add($curproc, $command_context, $uc_args); }; if ($r = $@) { croak($r); @@ -132,18 +132,18 @@ sub process # Descriptions: show cgi menu for adding a member. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -161,7 +161,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/Command/Admin/addmembers.pm b/fml/lib/FML/Command/Admin/addmembers.pm index 344db2ca..eb2af49b 100644 --- a/fml/lib/FML/Command/Admin/addmembers.pm +++ b/fml/lib/FML/Command/Admin/addmembers.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: add.pm,v 1.9 2004/01/02 14:42:42 fukachan Exp $ +# $FML: addmembers.pm,v 1.1 2004/05/01 05:02:04 fukachan Exp $ # package FML::Command::Admin::addmembers; @@ -18,13 +18,13 @@ use FML::Command::Admin::addmember; # Descriptions: add user as only member -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to addmember module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/addmoderator.pm b/fml/lib/FML/Command/Admin/addmoderator.pm index e96ce09c..9cc8bbda 100644 --- a/fml/lib/FML/Command/Admin/addmoderator.pm +++ b/fml/lib/FML/Command/Admin/addmoderator.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: addmoderator.pm,v 1.16 2005/08/17 10:36:35 fukachan Exp $ +# $FML: addmoderator.pm,v 1.17 2005/08/17 12:08:42 fukachan Exp $ # package FML::Command::Admin::addmoderator; @@ -27,7 +27,7 @@ add a new moderator address. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -60,29 +60,29 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: add a new moderator. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map and $recipient_map maps. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); - my $options = $command_args->{ options }; - my $address = $command_args->{ command_data } || $options->[ 0 ]; + my $options = $command_context->get_options(); + my $address = $command_context->{ command_data } || $options->[ 0 ]; # XXX We should always add/rewrite only $primary_*_map maps via # XXX command mail, CUI and GUI. @@ -111,7 +111,7 @@ sub process eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_add($curproc, $command_args, $uc_args); + $obj->user_add($curproc, $command_context, $uc_args); }; if ($r = $@) { croak($r); @@ -120,18 +120,18 @@ sub process # Descriptions: cgi menu to add a new moderator. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -149,7 +149,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/Command/Admin/addpriv.pm b/fml/lib/FML/Command/Admin/addpriv.pm index f28255e5..a611cee4 100644 --- a/fml/lib/FML/Command/Admin/addpriv.pm +++ b/fml/lib/FML/Command/Admin/addpriv.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2002,2003,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: addpriv.pm,v 1.5 2003/12/31 03:49:16 fukachan Exp $ +# $FML: addpriv.pm,v 1.6 2003/12/31 04:08:43 fukachan Exp $ # package FML::Command::Admin::addpriv; @@ -18,13 +18,13 @@ use FML::Command::Admin::addadmin; # Descriptions: add a new remote administrator -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to addadmin module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003 Ken'ichi Fukamachi +Copyright (C) 2002,2003,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/Admin/addrecipient.pm b/fml/lib/FML/Command/Admin/addrecipient.pm index eb362ece..9ebe0ae2 100644 --- a/fml/lib/FML/Command/Admin/addrecipient.pm +++ b/fml/lib/FML/Command/Admin/addrecipient.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: addrecipient.pm,v 1.5 2005/08/17 12:08:43 fukachan Exp $ +# $FML: addrecipient.pm,v 1.6 2005/11/30 23:30:38 fukachan Exp $ # package FML::Command::Admin::addrecipient; @@ -27,7 +27,7 @@ change delivery mode from digest to real time. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -60,30 +60,30 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: change delivery mode from digest to real time. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); - my $options = $command_args->{ options }; - my $address = $command_args->{ command_data } || $options->[ 0 ]; + my $options = $command_context->get_options(); + my $address = $command_context->{ command_data } || $options->[ 0 ]; # XXX We should always add/rewrite only $primary_*_map maps via # XXX command mail, CUI and GUI. @@ -123,7 +123,7 @@ sub process eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_add($curproc, $command_args, $uc_args); + $obj->user_add($curproc, $command_context, $uc_args); }; if ($r = $@) { croak($r); @@ -132,18 +132,18 @@ sub process # Descriptions: show cgi menu for adding a recipient. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -161,7 +161,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/Command/Admin/addrecipients.pm b/fml/lib/FML/Command/Admin/addrecipients.pm index 14618136..4077b0c2 100644 --- a/fml/lib/FML/Command/Admin/addrecipients.pm +++ b/fml/lib/FML/Command/Admin/addrecipients.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: add.pm,v 1.9 2004/01/02 14:42:42 fukachan Exp $ +# $FML: addrecipients.pm,v 1.1 2004/05/01 05:02:05 fukachan Exp $ # package FML::Command::Admin::addrecipients; @@ -18,13 +18,13 @@ use FML::Command::Admin::addrecipient; # Descriptions: add user as only recipient -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to addrecipient module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/adduser.pm b/fml/lib/FML/Command/Admin/adduser.pm index 52456cc3..92e3dc45 100644 --- a/fml/lib/FML/Command/Admin/adduser.pm +++ b/fml/lib/FML/Command/Admin/adduser.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2004 Ken'ichi Fukamachi +# Copyright (C) 2002,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: adduser.pm,v 1.4 2002/12/15 13:46:28 fukachan Exp $ +# $FML: adduser.pm,v 1.5 2004/01/02 14:42:42 fukachan Exp $ # package FML::Command::Admin::adduser; @@ -18,13 +18,13 @@ use FML::Command::Admin::subscribe; # Descriptions: add a new member. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to subscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2004 Ken'ichi Fukamachi +Copyright (C) 2002,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/Command/Admin/adminadd.pm b/fml/lib/FML/Command/Admin/adminadd.pm index d95b9be9..c3d2347f 100644 --- a/fml/lib/FML/Command/Admin/adminadd.pm +++ b/fml/lib/FML/Command/Admin/adminadd.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2002,2003,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: adminadd.pm,v 1.4 2003/12/31 03:49:16 fukachan Exp $ +# $FML: adminadd.pm,v 1.5 2003/12/31 04:08:44 fukachan Exp $ # package FML::Command::Admin::adminadd; @@ -18,13 +18,13 @@ use FML::Command::Admin::addadmin; # Descriptions: add a remote administrator -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to subscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003 Ken'ichi Fukamachi +Copyright (C) 2002,2003,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/Admin/admindel.pm b/fml/lib/FML/Command/Admin/admindel.pm index 80c27dd2..6fb42f83 100644 --- a/fml/lib/FML/Command/Admin/admindel.pm +++ b/fml/lib/FML/Command/Admin/admindel.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: admindel.pm,v 1.13 2003/12/31 03:49:16 fukachan Exp $ +# $FML: admindel.pm,v 1.1 2004/05/02 00:56:48 fukachan Exp $ # package FML::Command::Admin::admindel; @@ -17,13 +17,13 @@ use FML::Command::Admin::deladmin; # Descriptions: remove the specified remote administorator. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to deladmin module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -41,7 +41,7 @@ remove the specified administrator. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =head1 CODING STYLE @@ -53,7 +53,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/bye.pm b/fml/lib/FML/Command/Admin/bye.pm index 4af1b3d3..a91c49d6 100644 --- a/fml/lib/FML/Command/Admin/bye.pm +++ b/fml/lib/FML/Command/Admin/bye.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,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: bye.pm,v 1.10 2002/12/15 13:46:28 fukachan Exp $ +# $FML: bye.pm,v 1.11 2004/01/02 14:42:42 fukachan Exp $ # package FML::Command::Admin::bye; @@ -18,13 +18,13 @@ use FML::Command::Admin::unsubscribe; # Descriptions: remove the specified user. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to unsubscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -50,7 +50,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +Copyright (C) 2001,2002,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/Command/Admin/byeadmin.pm b/fml/lib/FML/Command/Admin/byeadmin.pm index 2ac71117..40b0cef7 100644 --- a/fml/lib/FML/Command/Admin/byeadmin.pm +++ b/fml/lib/FML/Command/Admin/byeadmin.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,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: byeadmin.pm,v 1.12 2003/08/23 04:35:29 fukachan Exp $ +# $FML: byeadmin.pm,v 1.13 2003/12/31 03:49:16 fukachan Exp $ # package FML::Command::Admin::byeadmin; @@ -17,13 +17,13 @@ use FML::Command::Admin::deladmin; # Descriptions: remove the specified remote administorator. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to deladmin module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -41,7 +41,7 @@ remove the specified administrator. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =head1 CODING STYLE @@ -53,7 +53,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,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/Admin/byepriv.pm b/fml/lib/FML/Command/Admin/byepriv.pm index 5e52f394..b7f99611 100644 --- a/fml/lib/FML/Command/Admin/byepriv.pm +++ b/fml/lib/FML/Command/Admin/byepriv.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2002,2003,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: byepriv.pm,v 1.5 2003/12/31 03:49:16 fukachan Exp $ +# $FML: byepriv.pm,v 1.6 2003/12/31 04:08:43 fukachan Exp $ # package FML::Command::Admin::byepriv; @@ -18,13 +18,13 @@ use FML::Command::Admin::byeadmin; # Descriptions: remove the specified remote administrator -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to byeadmin module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003 Ken'ichi Fukamachi +Copyright (C) 2002,2003,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/Admin/chaddr.pm b/fml/lib/FML/Command/Admin/chaddr.pm index 218ac087..dfbdd04b 100644 --- a/fml/lib/FML/Command/Admin/chaddr.pm +++ b/fml/lib/FML/Command/Admin/chaddr.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004 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: chaddr.pm,v 1.26 2004/04/28 04:10:36 fukachan Exp $ +# $FML: chaddr.pm,v 1.27 2004/06/29 10:02:42 fukachan Exp $ # package FML::Command::Admin::chaddr; @@ -27,7 +27,7 @@ change address from old one to new one. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) change address from old one to new one. @@ -62,15 +62,15 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; - my $comname = $command_args->{ comname } || ''; - my $comsubname = $command_args->{ comsubname } || ''; - my $options = $command_args->{ options } || []; + my ($self, $curproc, $command_context) = @_; + my $comname = $command_context->get_cooked_command() || ''; + my $comsubname = $command_context->get_cooked_subcommand() || ''; + my $options = $command_context->get_options() || []; my @test = ($comname); my $command = $options->[ 0 ] || ''; my $oldaddr = $options->[ 1 ] || ''; @@ -99,7 +99,7 @@ sub verify_syntax use FML::Command; $dispatch = new FML::Command; - if ($dispatch->safe_regexp_match($curproc, $command_args, \@test)) { + if ($dispatch->safe_regexp_match($curproc, $command_context, \@test)) { $ok++; } @@ -108,14 +108,14 @@ sub verify_syntax # Descriptions: change address from old one to new one. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); - my $options = $command_args->{ options } || []; + my $options = $command_context->get_options() || []; # XXX We should always add/rewrite only $primary_*_map maps via # XXX command mail, CUI and GUI. @@ -129,8 +129,8 @@ sub process my $old_address = ''; my $new_address = ''; - if (defined $command_args->{ command_data }) { - my $x = $command_args->{ command_data }; + if (defined $command_context->{ command_data }) { + my $x = $command_context->{ command_data }; ($old_address, $new_address) = split(/\s+/, $x); } else { @@ -169,7 +169,7 @@ sub process eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_chaddr($curproc, $command_args, $uc_args); + $obj->user_chaddr($curproc, $command_context, $uc_args); }; if ($r = $@) { croak($r); @@ -187,7 +187,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003,2004 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/Command/Admin/changepassword.pm b/fml/lib/FML/Command/Admin/changepassword.pm index d0a031a9..665742f4 100644 --- a/fml/lib/FML/Command/Admin/changepassword.pm +++ b/fml/lib/FML/Command/Admin/changepassword.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: changepassword.pm,v 1.16 2005/05/27 03:03:34 fukachan Exp $ +# $FML: changepassword.pm,v 1.17 2005/11/30 23:30:38 fukachan Exp $ # package FML::Command::Admin::changepassword; @@ -27,7 +27,7 @@ set password for a new address or change password. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) change remote administrator password. @@ -62,15 +62,15 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; - my $comname = $command_args->{ comname } || ''; - my $comsubname = $command_args->{ comsubname } || ''; - my $options = $command_args->{ options } || []; + my ($self, $curproc, $command_context) = @_; + my $comname = $command_context->get_cooked_command() || ''; + my $comsubname = $command_context->get_cooked_subcommand() || ''; + my $options = $command_context->get_options() || []; my @test = ($comname); my $command = $options->[ 0 ] || ''; my $address = $options->[ 1 ] || ''; @@ -90,20 +90,20 @@ sub verify_syntax # 2. check syntax of (only) command name. use FML::Command; my $dispatch = new FML::Command; - return $dispatch->safe_regexp_match($curproc, $command_args, \@test); + return $dispatch->safe_regexp_match($curproc, $command_context, \@test); } # Descriptions: change the admin password. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: NUM sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $myname = $curproc->myname(); - my $options = $command_args->{ options }; + my $options = $command_context->get_options(); # XXX The arguments differ for the cases. # 1. command mail: admin changepassword [$USER] $PASSWORD @@ -141,7 +141,7 @@ sub process my $safe = new FML::Restriction::Base; if ($safe->regexp_match('address', $address)) { $self->_change_password($curproc, - $command_args, + $command_context, $address, $password); } @@ -158,13 +158,13 @@ sub process # Descriptions: change the remote admin password. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # STR($address) STR($password) # Side Effects: update *admin_member_password_maps # Return Value: NUM sub _change_password { - my ($self, $curproc, $command_args, $address, $password) = @_; + my ($self, $curproc, $command_context, $address, $password) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); @@ -197,7 +197,7 @@ sub _change_password eval q{ use FML::Command::Auth; my $passwd = new FML::Command::Auth; - $passwd->change_password($curproc, $command_args, $up_args); + $passwd->change_password($curproc, $command_context, $up_args); }; if ($r = $@) { croak($r); @@ -206,12 +206,12 @@ sub _change_password # Descriptions: rewrite buffer to hide the password phrase in $rbuf. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) STR_REF($rbuf) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) STR_REF($rbuf) # Side Effects: none # Return Value: none sub rewrite_prompt { - my ($self, $curproc, $command_args, $rbuf) = @_; + my ($self, $curproc, $command_context, $rbuf) = @_; if (defined $rbuf) { $$rbuf =~ s/^(.*(password|pass)\s+\S+).*/$1 ********/; @@ -232,7 +232,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/Command/Admin/check.pm b/fml/lib/FML/Command/Admin/check.pm index 2b0e6454..57baf449 100644 --- a/fml/lib/FML/Command/Admin/check.pm +++ b/fml/lib/FML/Command/Admin/check.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004 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: check.pm,v 1.13 2004/04/23 04:10:29 fukachan Exp $ +# $FML: check.pm,v 1.14 2004/06/26 11:47:56 fukachan Exp $ # package FML::Command::Admin::check; @@ -58,15 +58,15 @@ my @rules = qw( # Descriptions: top level dispatcher. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; for my $rule (@rules) { - $self->$rule($curproc, $command_args); + $self->$rule($curproc, $command_context); } } @@ -75,12 +75,12 @@ sub process # Descriptions: check the existence of $ml_home_dir. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub check_ml_home_dir { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $ml_name = $curproc->ml_name(); my $ml_domain = $curproc->ml_domain(); my $ml_home_dir = $curproc->ml_home_dir($ml_name, $ml_domain); @@ -100,12 +100,12 @@ sub check_ml_home_dir # Descriptions: check spool permission. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: fix permission # Return Value: none sub check_spool_dir { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $spool_dir = $config->{ spool_dir }; @@ -133,12 +133,12 @@ sub check_spool_dir # Descriptions: check html_archive permission. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: fix permission # Return Value: none sub check_html_archive_dir { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $html_dir = $config->{ html_archive_dir }; @@ -227,7 +227,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003,2004 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/Command/Admin/chpass.pm b/fml/lib/FML/Command/Admin/chpass.pm index a86e1e88..127595a5 100644 --- a/fml/lib/FML/Command/Admin/chpass.pm +++ b/fml/lib/FML/Command/Admin/chpass.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2003,2004 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: chpass.pm,v 1.2 2004/01/01 08:41:33 fukachan Exp $ +# $FML: chpass.pm,v 1.3 2004/01/01 08:48:39 fukachan Exp $ # package FML::Command::Admin::chpass; @@ -18,13 +18,13 @@ use FML::Command::Admin::changepassword; # Descriptions: change remote administrator password. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to password module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -51,7 +51,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2003,2004 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/Command/Admin/config.pm b/fml/lib/FML/Command/Admin/config.pm index f46f2b2d..af5c09cd 100644 --- a/fml/lib/FML/Command/Admin/config.pm +++ b/fml/lib/FML/Command/Admin/config.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: config.pm,v 1.1 2004/11/21 05:36:11 fukachan Exp $ +# $FML: config.pm,v 1.2 2004/12/19 11:10:51 fukachan Exp $ # package FML::Command::Admin::config; @@ -31,7 +31,7 @@ Tool to config config.cf. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) C<TODO>: now we can read and write config.cf, but can not change it. @@ -62,13 +62,13 @@ sub need_lock { 0;} # Descriptions: run "vi" or the specified configor to config config.cf. # If environmental variable EDITOR is specified, # try to run "$EDITOR config.cf". -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update config.cf # change $ENV{ PATH } withiin running configor. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Config::Menu; my $menu = new FML::Config::Menu $curproc; @@ -87,7 +87,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/deladmin.pm b/fml/lib/FML/Command/Admin/deladmin.pm index 5959d67b..7d148efa 100644 --- a/fml/lib/FML/Command/Admin/deladmin.pm +++ b/fml/lib/FML/Command/Admin/deladmin.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: deladmin.pm,v 1.20 2005/08/17 10:36:36 fukachan Exp $ +# $FML: deladmin.pm,v 1.21 2005/08/17 12:08:43 fukachan Exp $ # package FML::Command::Admin::deladmin; @@ -27,7 +27,7 @@ remove the specified remote administrator. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -60,26 +60,26 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: remove the specified remote administrator. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); # XXX We should always add/rewrite only $primary_*_map maps via @@ -91,8 +91,8 @@ sub process # XXX For example, $member_maps contains different classes. my $member_map = $config->{ 'primary_admin_member_map' }; my $recipient_map = $config->{ 'primary_admin_recipient_map' }; - my $options = $command_args->{ options }; - my $address = $command_args->{ command_data } || $options->[ 0 ]; + my $options = $command_context->get_options(); + my $address = $command_context->{ command_data } || $options->[ 0 ]; # fundamental sanity check croak("address not undefined") unless defined $address; @@ -113,7 +113,7 @@ sub process eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_del($curproc, $command_args, $uc_args); + $obj->user_del($curproc, $command_context, $uc_args); }; if ($r = $@) { croak($r); @@ -122,18 +122,18 @@ sub process # Descriptions: show cgi menu to remove the specified remote administrator. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -151,7 +151,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/Command/Admin/delmoderator.pm b/fml/lib/FML/Command/Admin/delmoderator.pm index de9103d8..65042964 100644 --- a/fml/lib/FML/Command/Admin/delmoderator.pm +++ b/fml/lib/FML/Command/Admin/delmoderator.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: delmoderator.pm,v 1.19 2005/08/17 10:36:36 fukachan Exp $ +# $FML: delmoderator.pm,v 1.20 2005/08/17 12:08:42 fukachan Exp $ # package FML::Command::Admin::delmoderator; @@ -27,7 +27,7 @@ remove the specified moderator. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -60,29 +60,29 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: remove the specified moderator. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); - my $options = $command_args->{ options }; - my $address = $command_args->{ command_data } || $options->[ 0 ]; + my $options = $command_context->get_options(); + my $address = $command_context->{ command_data } || $options->[ 0 ]; # XXX We should always add/rewrite only $primary_*_map maps via # XXX command mail, CUI and GUI. @@ -113,7 +113,7 @@ sub process eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_del($curproc, $command_args, $uc_args); + $obj->user_del($curproc, $command_context, $uc_args); }; if ($r = $@) { croak($r); @@ -122,18 +122,18 @@ sub process # Descriptions: show cgi menu to remove the specified moderator. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -151,7 +151,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/Command/Admin/deluser.pm b/fml/lib/FML/Command/Admin/deluser.pm index 9e4ad49a..7a3cc4de 100644 --- a/fml/lib/FML/Command/Admin/deluser.pm +++ b/fml/lib/FML/Command/Admin/deluser.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,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: deluser.pm,v 1.4 2002/12/15 13:46:28 fukachan Exp $ +# $FML: deluser.pm,v 1.5 2004/01/02 14:42:42 fukachan Exp $ # package FML::Command::Admin::deluser; @@ -18,13 +18,13 @@ use FML::Command::Admin::unsubscribe; # Descriptions: remove the specified user. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to unsubscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +Copyright (C) 2001,2002,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/Command/Admin/digest.pm b/fml/lib/FML/Command/Admin/digest.pm index 20acf3f7..a22e1df2 100644 --- a/fml/lib/FML/Command/Admin/digest.pm +++ b/fml/lib/FML/Command/Admin/digest.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004,2005 MURASHITA Takuya +# Copyright (C) 2002,2003,2004,2005,2006 MURASHITA Takuya # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: digest.pm,v 1.24 2005/08/17 12:08:43 fukachan Exp $ +# $FML: digest.pm,v 1.25 2005/11/30 23:30:38 fukachan Exp $ # package FML::Command::Admin::digest; @@ -32,7 +32,7 @@ change digest mode for the specified address to off/on. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -65,28 +65,28 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: toggle delivery mode between real time and digest. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map,$digest_recipient_maps # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); - my $options = $command_args->{ options } || []; + my $options = $command_context->get_options() || []; # XXX We should always add/rewrite only $primary_*_map maps via # XXX command mail, CUI and GUI. @@ -101,7 +101,7 @@ sub process my $digest_recipient_maps = $config->get_as_array_ref('digest_recipient_maps'); - my $address = $command_args->{ command_data } || $options->[ 0 ] || undef; + my $address = $command_context->{ command_data } || $options->[ 0 ] || undef; my $mode = $options->[ 1 ] || ''; # fundamental check @@ -134,10 +134,10 @@ sub process $mode =~ tr/A-Z/a-z/; if ($mode eq "on") { - $self->_digest_on($curproc, $command_args, $digest_args); + $self->_digest_on($curproc, $command_context, $digest_args); } elsif ($mode eq "off") { - $self->_digest_off($curproc, $command_args, $digest_args); + $self->_digest_off($curproc, $command_context, $digest_args); } else { croak("unknown mode: mode is off or on"); @@ -151,12 +151,12 @@ sub process # Descriptions: change delivery mode to real time. # Arguments: OBJ($self) -# OBJ($curproc) HASH_REF($command_args) HASH_REF($dargs) +# OBJ($curproc) OBJ($command_context) HASH_REF($dargs) # Side Effects: update $recipient_map # Return Value: none sub _digest_on { - my ($self, $curproc, $command_args, $dargs) = @_; + my ($self, $curproc, $command_context, $dargs) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); my $address = $dargs->{ address }; @@ -181,7 +181,7 @@ sub _digest_on # 1. remove address from $recipient_map (normal delivery recipients). # we should remove address if $recipient_map conatins it. if ($cred->has_address_in_map($recipient_map, $config, $address)) { - $self->_user_del($curproc, $command_args, $uc_normal_args); + $self->_user_del($curproc, $command_context, $uc_normal_args); } else { my $r = "no such recipient"; @@ -200,7 +200,7 @@ sub _digest_on croak($r); } else { - $self->_user_add($curproc, $command_args, $uc_digest_args); + $self->_user_add($curproc, $command_context, $uc_digest_args); } # XXX-TODO: need transaction ? @@ -209,12 +209,12 @@ sub _digest_on # Descriptions: change delivery mode to digest. # Arguments: OBJ($self) -# OBJ($curproc) HASH_REF($command_args) HASH_REF($dargs) +# OBJ($curproc) OBJ($command_context) HASH_REF($dargs) # Side Effects: update $recipient_map # Return Value: none sub _digest_off { - my ($self, $curproc, $command_args, $dargs) = @_; + my ($self, $curproc, $command_context, $dargs) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); my $address = $dargs->{ address }; @@ -239,7 +239,7 @@ sub _digest_off # 1. remove address from digest_recipient_map. # we should remove address if $digest_recipient_map contains it. if ($cred->has_address_in_map($digest_recipient_map, $config, $address)) { - $self->_user_del($curproc, $command_args, $uc_digest_args); + $self->_user_del($curproc, $command_context, $uc_digest_args); } else { my $r = "no such digest recipient"; @@ -260,7 +260,7 @@ sub _digest_off croak($r); } else { - $self->_user_add($curproc, $command_args, $uc_normal_args); + $self->_user_add($curproc, $command_context, $uc_normal_args); } # XXX-TODO: need transaction ? @@ -269,18 +269,18 @@ sub _digest_off # Descriptions: add the specified user. # Arguments: OBJ($self) -# OBJ($curproc) HASH_REF($command_args) HASH_REF($uc_args) +# OBJ($curproc) OBJ($command_context) HASH_REF($uc_args) # Side Effects: update address list(s). # Return Value: none sub _user_add { - my ($self, $curproc, $command_args, $uc_args) = @_; + my ($self, $curproc, $command_context, $uc_args) = @_; my $r = ''; eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_add($curproc, $command_args, $uc_args); + $obj->user_add($curproc, $command_context, $uc_args); }; if ($r = $@) { @@ -291,18 +291,18 @@ sub _user_add # Descriptions: remove the specified user. # Arguments: OBJ($self) -# OBJ($curproc) HASH_REF($command_args) HASH_REF($uc_args) +# OBJ($curproc) OBJ($command_context) HASH_REF($uc_args) # Side Effects: update address list(s). # Return Value: none sub _user_del { - my ($self, $curproc, $command_args, $uc_args) = @_; + my ($self, $curproc, $command_context, $uc_args) = @_; my $r = ''; eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_del($curproc, $command_args, $uc_args); + $obj->user_del($curproc, $command_context, $uc_args); }; if ($r = $@) { @@ -312,12 +312,12 @@ sub _user_del # Descriptions: show cgi menu. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; # @@ -328,7 +328,7 @@ sub cgi_menu eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -346,7 +346,7 @@ MURASHITA Takuya =head1 COPYRIGHT -Copyright (C) 2002,2003,2004,2005 MURASHITA Takuya +Copyright (C) 2002,2003,2004,2005,2006 MURASHITA Takuya 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/digestoff.pm b/fml/lib/FML/Command/Admin/digestoff.pm index 134bda09..2879ff70 100644 --- a/fml/lib/FML/Command/Admin/digestoff.pm +++ b/fml/lib/FML/Command/Admin/digestoff.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004 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: digestoff.pm,v 1.11 2004/04/28 04:10:36 fukachan Exp $ +# $FML: digestoff.pm,v 1.12 2004/06/30 03:05:13 fukachan Exp $ # package FML::Command::Admin::digestoff; @@ -28,7 +28,7 @@ It means delivery to this address from digest to real delivery mode. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -61,52 +61,52 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: disable digest mode for the specified user. # changed from digest to real delivery mode. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map,$digest_recipient_maps # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - my $options = $command_args->{ options } || []; - my $address = $command_args->{ command_data } || $options->[ 0 ] || undef; + my ($self, $curproc, $command_context) = @_; + my $options = $command_context->get_options() || []; + my $address = $command_context->{ command_data } || $options->[ 0 ] || undef; # mode off $options->[ 1 ] = "off"; use FML::Command::Admin::digest; my $digest = new FML::Command::Admin::digest; - $digest->process($curproc, $command_args); + $digest->process($curproc, $command_context); } # Descriptions: show cgi menu for digestoff. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -124,7 +124,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003,2004 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/Command/Admin/digeston.pm b/fml/lib/FML/Command/Admin/digeston.pm index ba503805..df5b3a8b 100644 --- a/fml/lib/FML/Command/Admin/digeston.pm +++ b/fml/lib/FML/Command/Admin/digeston.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004 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: digeston.pm,v 1.11 2004/04/28 04:10:36 fukachan Exp $ +# $FML: digeston.pm,v 1.12 2004/06/30 03:05:13 fukachan Exp $ # package FML::Command::Admin::digeston; @@ -28,7 +28,7 @@ change delivery mode to this address from real to digest one. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -61,52 +61,52 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: digest mode on for the specified user. # change delivery mode to this address from real to digest one. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map,$digest_recipient_maps # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - my $options = $command_args->{ options } || []; - my $address = $command_args->{ command_data } || $options->[ 0 ] || undef; + my ($self, $curproc, $command_context) = @_; + my $options = $command_context->get_options() || []; + my $address = $command_context->{ command_data } || $options->[ 0 ] || undef; # mode on $options->[ 1 ] = "on"; use FML::Command::Admin::digest; my $digest = new FML::Command::Admin::digest; - $digest->process($curproc, $command_args); + $digest->process($curproc, $command_context); } # Descriptions: show cgi menu for digest on. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -124,7 +124,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003,2004 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/Command/Admin/dir.pm b/fml/lib/FML/Command/Admin/dir.pm index 0ba7c95d..8a5fd018 100644 --- a/fml/lib/FML/Command/Admin/dir.pm +++ b/fml/lib/FML/Command/Admin/dir.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: dir.pm,v 1.20 2005/08/11 04:07:32 fukachan Exp $ +# $FML: dir.pm,v 1.21 2005/08/17 12:08:43 fukachan Exp $ # package FML::Command::Admin::dir; @@ -27,7 +27,7 @@ show "ls -l" results. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -53,14 +53,14 @@ sub need_lock { 0;} # Descriptions: show the result by "ls -l". -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map and $recipient_map. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); - my $options = $command_args->{ options }; + my $options = $command_context->get_options(); my $du_args = {}; my @argv = (); my $recipient = ''; @@ -83,7 +83,7 @@ sub process if ($curproc->is_cui_process()) { # --send-to option. $recipient = $curproc->command_line_cui_specific_recipient() || ''; - $command_args->{ _recipient } = $recipient; + $command_context->{ _recipient } = $recipient; } if (@argv) { @@ -97,17 +97,17 @@ sub process # XXX-TODO: $dir = new FML::Command::DirUtils $dir_string; $dir->list(). ? use FML::Command::DirUtils; my $obj = new FML::Command::DirUtils; - $obj->dir($curproc, $command_args, $du_args); + $obj->dir($curproc, $command_context, $du_args); } # Descriptions: cgi menu (dummy). -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; ; } @@ -123,7 +123,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/Command/Admin/edit.pm b/fml/lib/FML/Command/Admin/edit.pm index 9dc7aa71..643d11ed 100644 --- a/fml/lib/FML/Command/Admin/edit.pm +++ b/fml/lib/FML/Command/Admin/edit.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004 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$ +# $FML: edit.pm,v 1.19 2004/06/26 11:39:16 fukachan Exp $ # package FML::Command::Admin::edit; @@ -29,7 +29,7 @@ Tool to edit config.cf. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) C<TODO>: now we can read and write config.cf, but can not change it. @@ -60,13 +60,13 @@ sub need_lock { 0;} # Descriptions: run "vi" or the specified editor to edit config.cf. # If environmental variable EDITOR is specified, # try to run "$EDITOR config.cf". -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update config.cf # change $ENV{ PATH } withiin running editor. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $ml_name = $curproc->ml_name(); my $ml_domain = $curproc->ml_domain(); my $config_cf = $curproc->config_cf_filepath($ml_name, $ml_domain); @@ -97,7 +97,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004 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/Command/Admin/error.pm b/fml/lib/FML/Command/Admin/error.pm index e8f44820..694ed825 100644 --- a/fml/lib/FML/Command/Admin/error.pm +++ b/fml/lib/FML/Command/Admin/error.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: error.pm,v 1.16 2005/08/11 04:07:32 fukachan Exp $ +# $FML: error.pm,v 1.17 2005/08/17 12:08:43 fukachan Exp $ # package FML::Command::Admin::error; @@ -27,7 +27,7 @@ show error status. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) call error status generator. @@ -62,12 +62,12 @@ sub lock_channel { return undef;} # Descriptions: list up status of error messages. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; $self->_fmlerror($curproc); } @@ -136,7 +136,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/Command/Admin/file.pm b/fml/lib/FML/Command/Admin/file.pm index c8a1dacb..7b312488 100644 --- a/fml/lib/FML/Command/Admin/file.pm +++ b/fml/lib/FML/Command/Admin/file.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004 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: file.pm,v 1.17 2004/01/01 23:52:12 fukachan Exp $ +# $FML: file.pm,v 1.18 2004/06/26 11:47:56 fukachan Exp $ # package FML::Command::Admin::file; @@ -25,7 +25,7 @@ See C<FML::Command> for more details. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) dispatch functions for file operations. @@ -67,15 +67,15 @@ sub is_subcommand_style { 1;} # Descriptions: dispatcher of file subcommand operations. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: file is created, renamed and removed # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $log_file = $config->{ log_file }; - my $options = $command_args->{ options } || []; + my $options = $command_context->get_options() || []; my $du_args = {}; my @argv = (); @@ -98,7 +98,7 @@ sub process use FML::Command::FileUtils; my $obj = new FML::Command::FileUtils; - $obj->remove($curproc, $command_args, $du_args); + $obj->remove($curproc, $command_context, $du_args); } else { croak("Admin::file: unknown subcommand"); @@ -107,12 +107,12 @@ sub process # Descriptions: show cgi menu (dummy). -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; # XXX-TODO: dummy.? ; @@ -129,7 +129,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003,2004 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/Command/Admin/flush.pm b/fml/lib/FML/Command/Admin/flush.pm index 7645e1f5..8b70adf1 100644 --- a/fml/lib/FML/Command/Admin/flush.pm +++ b/fml/lib/FML/Command/Admin/flush.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: @template.pm,v 1.8 2004/01/01 07:29:27 fukachan Exp $ +# $FML: flush.pm,v 1.1 2004/05/19 13:48:20 fukachan Exp $ # package FML::Command::Admin::flush; @@ -17,13 +17,13 @@ use FML::Command::Admin::flushq; # Descriptions: subscribe user -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to subscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -47,7 +47,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/flushq.pm b/fml/lib/FML/Command/Admin/flushq.pm index fe35a31f..f721c563 100644 --- a/fml/lib/FML/Command/Admin/flushq.pm +++ b/fml/lib/FML/Command/Admin/flushq.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: flushq.pm,v 1.1 2004/05/19 13:48:21 fukachan Exp $ +# $FML: flushq.pm,v 1.2 2004/06/26 11:47:56 fukachan Exp $ # package FML::Command::Admin::flushq; @@ -47,12 +47,12 @@ sub need_lock { 0;} # Descriptions: flush outgoing mail queue. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; $curproc->queue_flush(); } @@ -68,7 +68,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/get.pm b/fml/lib/FML/Command/Admin/get.pm index 1c14a0b7..7a01136d 100644 --- a/fml/lib/FML/Command/Admin/get.pm +++ b/fml/lib/FML/Command/Admin/get.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: get.pm,v 1.27 2005/08/11 04:07:32 fukachan Exp $ +# $FML: get.pm,v 1.28 2005/08/17 12:08:43 fukachan Exp $ # package FML::Command::Admin::get; @@ -55,21 +55,21 @@ sub need_lock { 0;} # Descriptions: send arbitrary file(s) in $ml_home_dir by # FML::Command::SendFile. # XXX we permit arbitrary file for administrator to retrieve. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $ml_home_dir = $config->{ ml_home_dir }; - my $command = $command_args->{ command }; - my $options = $command_args->{ options }; + my $command = $command_context->{ command }; + my $options = $command_context->get_options(); my $recipient = ''; if ($curproc->is_cui_process()) { $recipient = $curproc->command_line_cui_specific_recipient() || ''; - $command_args->{ _recipient } = $recipient; + $command_context->{ _recipient } = $recipient; } # This module is called after @@ -85,13 +85,13 @@ sub process if (-f $filepath) { $curproc->log("send back $filename"); - $command_args->{ _filename_to_send } = $filename; - $command_args->{ _filepath_to_send } = $filepath; + $command_context->{ _filename_to_send } = $filename; + $command_context->{ _filepath_to_send } = $filepath; - $self->send_file($curproc, $command_args); + $self->send_file($curproc, $command_context); - delete $command_args->{ _filename_to_send }; - delete $command_args->{ _filepath_to_send }; + delete $command_context->{ _filename_to_send }; + delete $command_context->{ _filepath_to_send }; } else { $curproc->log("$filename not found"); @@ -105,8 +105,8 @@ sub process } - if (defined $command_args->{ _recipient }) { - delete $command_args->{ _recipient }; + if (defined $command_context->{ _recipient }) { + delete $command_context->{ _recipient }; } } @@ -121,7 +121,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/Command/Admin/htmlify.pm b/fml/lib/FML/Command/Admin/htmlify.pm index e33e01ee..7c0c9050 100644 --- a/fml/lib/FML/Command/Admin/htmlify.pm +++ b/fml/lib/FML/Command/Admin/htmlify.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004 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: htmlify.pm,v 1.25 2004/01/18 03:34:44 fukachan Exp $ +# $FML: htmlify.pm,v 1.26 2004/04/23 04:10:29 fukachan Exp $ # package FML::Command::Admin::htmlify; @@ -49,12 +49,12 @@ sub need_lock { 0;} # Descriptions: convert article(s) from text to html format. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to dir module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); # XXX-TODO: $spool_dir -> $article_spool_dir ? @@ -87,7 +87,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003,2004 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/Command/Admin/initpass.pm b/fml/lib/FML/Command/Admin/initpass.pm index 6e94abff..330d2958 100644 --- a/fml/lib/FML/Command/Admin/initpass.pm +++ b/fml/lib/FML/Command/Admin/initpass.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2003,2004 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: initpass.pm,v 1.2 2004/01/01 08:41:34 fukachan Exp $ +# $FML: initpass.pm,v 1.3 2004/01/01 08:48:39 fukachan Exp $ # package FML::Command::Admin::initpass; @@ -18,13 +18,13 @@ use FML::Command::Admin::changepassword; # Descriptions: initialize remote admin password of a new user. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to password module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - my $options = $command_args->{ options }; + my ($self, $curproc, $command_context) = @_; + my $options = $command_context->get_options(); if ($options->[ 2 ]) { croak("wrong arguments"); @@ -32,7 +32,7 @@ sub process elsif ($options->[ 1 ] && $options->[ 0 ]) { # [0] = username # [1] = password(plaintext) - $self->SUPER::process($curproc, $command_args); + $self->SUPER::process($curproc, $command_context); } else { croak("wrong arguments"); @@ -62,7 +62,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2003,2004 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/Command/Admin/list.pm b/fml/lib/FML/Command/Admin/list.pm index 8015643a..e47c162c 100644 --- a/fml/lib/FML/Command/Admin/list.pm +++ b/fml/lib/FML/Command/Admin/list.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004 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: list.pm,v 1.25 2004/05/16 02:26:11 fukachan Exp $ +# $FML: list.pm,v 1.26 2004/06/26 11:42:22 fukachan Exp $ # package FML::Command::Admin::list; @@ -49,32 +49,32 @@ sub need_lock { 0;} # Descriptions: show the specified map(s). -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to dir module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $options = []; - my $x_options = $command_args->{ options } || []; + my $x_options = $command_context->get_options() || []; # import makefml options if (defined $x_options && ref($x_options) eq 'ARRAY') { if (@$x_options) { $options = $x_options;} } - $self->_show_list($curproc, $command_args, $options); + $self->_show_list($curproc, $command_context, $options); } # Descriptions: show content of the specified map(s). -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # HASH_ARRAY($options) # Side Effects: none # Return Value: none sub _show_list { - my ($self, $curproc, $command_args, $options) = @_; + my ($self, $curproc, $command_context, $options) = @_; my $config = $curproc->config(); my $maplist = $config->get_as_array_ref('list_command_default_maps'); @@ -106,7 +106,7 @@ sub _show_list eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->print_userlist($curproc, $command_args, $uc_args); + $obj->print_userlist($curproc, $command_context, $uc_args); }; if ($r = $@) { croak($r); @@ -134,19 +134,19 @@ sub _get_map_candidates_as_array_ref # Descriptions: show cgi menu for list command. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; # navigation bar eval q{ use FML::CGI::List; my $obj = new FML::CGI::List; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { print $r; @@ -160,7 +160,7 @@ sub cgi_menu my $map_default = $curproc->safe_param_map() || ''; my $options = [ $map_default ]; eval q{ - $self->_show_list($curproc, $command_args, $options); + $self->_show_list($curproc, $command_context, $options); }; if ($r = $@) { print $r; @@ -179,7 +179,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003,2004 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/Command/Admin/log.pm b/fml/lib/FML/Command/Admin/log.pm index 78f56aab..265890a7 100644 --- a/fml/lib/FML/Command/Admin/log.pm +++ b/fml/lib/FML/Command/Admin/log.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: log.pm,v 1.30 2005/08/19 11:20:23 fukachan Exp $ +# $FML: log.pm,v 1.31 2006/02/22 12:05:59 fukachan Exp $ # package FML::Command::Admin::log; @@ -27,7 +27,7 @@ show log file(s). =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -53,12 +53,12 @@ sub need_lock { 0;} # Descriptions: show log file. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $log_file = $config->{ log_file }; @@ -70,12 +70,12 @@ sub process # Descriptions: show cgi menu. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $log_file = $config->{ log_file }; @@ -270,7 +270,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/Command/Admin/ls.pm b/fml/lib/FML/Command/Admin/ls.pm index fa86a65f..9886cfcf 100644 --- a/fml/lib/FML/Command/Admin/ls.pm +++ b/fml/lib/FML/Command/Admin/ls.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2004 Ken'ichi Fukamachi +# Copyright (C) 2002,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: ls.pm,v 1.5 2004/01/01 08:41:34 fukachan Exp $ +# $FML: ls.pm,v 1.6 2004/01/01 08:48:39 fukachan Exp $ # package FML::Command::Admin::ls; @@ -18,13 +18,13 @@ use FML::Command::Admin::dir; # Descriptions: file/directory listings. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to dir module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -50,7 +50,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2004 Ken'ichi Fukamachi +Copyright (C) 2002,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/Command/Admin/mailq.pm b/fml/lib/FML/Command/Admin/mailq.pm index 3f23e09b..8bdb5de1 100644 --- a/fml/lib/FML/Command/Admin/mailq.pm +++ b/fml/lib/FML/Command/Admin/mailq.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: mailq.pm,v 1.11 2004/09/04 03:13:16 fukachan Exp $ +# $FML: mailq.pm,v 1.12 2006/01/09 14:00:54 fukachan Exp $ # package FML::Command::Admin::mailq; @@ -27,7 +27,7 @@ list up outgoing mail queue. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -53,12 +53,12 @@ sub need_lock { 0;} # Descriptions: show outgoing mail queue. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; $self->_list_up_queue($curproc); } diff --git a/fml/lib/FML/Command/Admin/mergeml.pm b/fml/lib/FML/Command/Admin/mergeml.pm index ce67aacc..e39b36df 100644 --- a/fml/lib/FML/Command/Admin/mergeml.pm +++ b/fml/lib/FML/Command/Admin/mergeml.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: mergeml.pm,v 1.6 2004/11/25 12:07:40 fukachan Exp $ +# $FML: mergeml.pm,v 1.7 2006/01/09 14:00:54 fukachan Exp $ # package FML::Command::Admin::mergeml; @@ -50,15 +50,15 @@ sub need_lock { 0;} # Descriptions: merge other mailing list driver system into fml8. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: create mailing list directory, # install config.cf, include, include-ctl et. al. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); - my $options = $command_args->{ options } || []; + my $options = $command_context->get_options() || []; my $src_dir = $options->[ 0 ] || ''; # XXX-TODO: can we here use $curproc->ml_*() ? @@ -106,18 +106,18 @@ sub process # HERE WE GO! my $ml_list = "$ml_name\@$ml_domain"; print STDERR "merge configurations at @$options into $ml_list\n"; - $self->merge($curproc, $command_args, $params); + $self->merge($curproc, $command_context, $params); } # Descriptions: merge ML configurations. # Arguments: OBJ($self) -# OBJ($curproc) HASH_REF($command_args) HASH_REF($params) +# OBJ($curproc) OBJ($command_context) HASH_REF($params) # Side Effects: none # Return Value: none sub merge { - my ($self, $curproc, $command_args, $params) = @_; + my ($self, $curproc, $command_context, $params) = @_; my $src_dir = $params->{ src_dir } || undef; my $system = $params->{ target_system } || undef; @@ -135,8 +135,8 @@ sub merge # 3. run newml --force. use FML::Command::Admin::newml; my $ml = new FML::Command::Admin::newml; - $ml->set_force_mode($curproc, $command_args); - $ml->process($curproc, $command_args); + $ml->set_force_mode($curproc, $command_context); + $ml->process($curproc, $command_context); # 4. convert files if needed. $merge->convert_list_files(); diff --git a/fml/lib/FML/Command/Admin/mget.pm b/fml/lib/FML/Command/Admin/mget.pm index 3ca5080d..646f2ea2 100644 --- a/fml/lib/FML/Command/Admin/mget.pm +++ b/fml/lib/FML/Command/Admin/mget.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,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: mget.pm,v 1.8 2002/09/22 14:56:45 fukachan Exp $ +# $FML: mget.pm,v 1.9 2004/01/02 14:42:42 fukachan Exp $ # package FML::Command::Admin::mget; @@ -17,13 +17,13 @@ use FML::Command::Admin::get; # Descriptions: get file(s) in $ml_home_dir -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forwarded to get module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +Copyright (C) 2001,2002,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/Command/Admin/moderate.pm b/fml/lib/FML/Command/Admin/moderate.pm index 018b531f..9543ee3e 100644 --- a/fml/lib/FML/Command/Admin/moderate.pm +++ b/fml/lib/FML/Command/Admin/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$ +# $FML: moderate.pm,v 1.1 2005/12/18 12:03:17 fukachan Exp $ # package FML::Command::Admin::moderate; @@ -25,7 +25,7 @@ See C<FML::Command> for more details. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -58,26 +58,26 @@ sub lock_channel { return 'command_serialize';} # Descriptions: dummy. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; } # Descriptions: moderate submmited article. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); - my $options = $command_args->{ options } || []; - my $address = $command_args->{ command_data } || $options->[ 0 ]; - my $confirm_id = $command_args->{ _confirm_id } || undef; + my $options = $command_context->get_options() || []; + my $address = $command_context->{ command_data } || $options->[ 0 ]; + my $confirm_id = $command_context->{ _confirm_id } || undef; use FML::Confirm; my $cache_dir = $config->{ db_dir }; @@ -102,12 +102,12 @@ sub process # Descriptions: dummy. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; } @@ -122,7 +122,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/Admin/moderatoradd.pm b/fml/lib/FML/Command/Admin/moderatoradd.pm index 511c05f2..084b1def 100644 --- a/fml/lib/FML/Command/Admin/moderatoradd.pm +++ b/fml/lib/FML/Command/Admin/moderatoradd.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: moderatoradd.pm,v 1.1 2004/05/02 00:56:48 fukachan Exp $ +# $FML: moderatoradd.pm,v 1.2 2004/05/16 02:15:15 fukachan Exp $ # package FML::Command::Admin::moderatoradd; @@ -18,13 +18,13 @@ use FML::Command::Admin::addmoderator; # Descriptions: add a moderator -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to subscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/moderatordel.pm b/fml/lib/FML/Command/Admin/moderatordel.pm index 6278c1c2..f93cfe82 100644 --- a/fml/lib/FML/Command/Admin/moderatordel.pm +++ b/fml/lib/FML/Command/Admin/moderatordel.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2004 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: moderatordel.pm,v 1.13 2003/12/31 03:49:16 fukachan Exp $ +# $FML: moderatordel.pm,v 1.1 2004/05/02 00:56:49 fukachan Exp $ # package FML::Command::Admin::moderatordel; @@ -17,13 +17,13 @@ use FML::Command::Admin::delmoderator; # Descriptions: remove the specified remote moderatoristorator. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to delmoderator module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -41,7 +41,7 @@ remove the specified moderatoristrator. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =head1 CODING STYLE @@ -53,7 +53,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2004 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/Command/Admin/newcopml.pm b/fml/lib/FML/Command/Admin/newcopml.pm index b8c4bed4..1833d9e8 100644 --- a/fml/lib/FML/Command/Admin/newcopml.pm +++ b/fml/lib/FML/Command/Admin/newcopml.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: newcopml.pm,v 1.1 2006/02/04 08:00:09 fukachan Exp $ # package FML::Command::Admin::newcopml; @@ -23,7 +23,7 @@ FML::Command::Admin::newcopml - set up a new create-on-post mailing list. use FML::Command::Admin::newcopml; $obj = new FML::Command::Admin::newcopml; - $obj->newcopml($curproc, $command_args); + $obj->newcopml($curproc, $command_context); See C<FML::Command> for more details. @@ -35,7 +35,7 @@ install config.cf, include, include-ctl et. al. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -61,39 +61,39 @@ sub need_lock { 0;} # Descriptions: install create-on-post mailing list configuration. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: create mailing list directory, # install config.cf, include, include-ctl et. al. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; # 1. run newml. - $self->SUPER::process($curproc, $command_args); + $self->SUPER::process($curproc, $command_context); # 2. set up create-on-post configuration. use FML::ML::Control; my $control = new FML::ML::Control; $control->set_mode("create-on-post"); - $control->install_createonpost($curproc, $command_args); + $control->install_createonpost($curproc, $command_context); } # Descriptions: show cgi menu for newcopml command. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: create home directories, update aliases, ... # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; - # XXX-TODO: $command_args checked ? + # XXX-TODO: $command_context checked ? eval q{ use FML::CGI::ML; my $obj = new FML::CGI::ML; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -103,11 +103,11 @@ sub cgi_menu =head1 UTILITIES -=head2 set_force_mode($curproc, $command_args) +=head2 set_force_mode($curproc, $command_context) set force mode. -=head2 get_force_mode($curproc, $command_args) +=head2 get_force_mode($curproc, $command_context) return if force mode is enabled or not. @@ -115,23 +115,23 @@ return if force mode is enabled or not. # Descriptions: set force mode. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $self. # Return Value: none sub set_force_mode { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; $self->{ _force_mode } = 1; } # Descriptions: return if force mode is enabled or not. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub get_force_mode { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $options = $curproc->command_line_options(); if (defined $self->{ _force_mode }) { diff --git a/fml/lib/FML/Command/Admin/newdomain.pm b/fml/lib/FML/Command/Admin/newdomain.pm index 0bae0e1c..2327a776 100644 --- a/fml/lib/FML/Command/Admin/newdomain.pm +++ b/fml/lib/FML/Command/Admin/newdomain.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2003,2004 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: newdomain.pm,v 1.7 2004/01/02 16:08:38 fukachan Exp $ +# $FML: newdomain.pm,v 1.8 2004/07/23 13:16:35 fukachan Exp $ # package FML::Command::Admin::newdomain; @@ -49,13 +49,13 @@ sub need_lock { 0;} # Descriptions: declare a new domain we use. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to dir module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - my $canon_argv = $command_args->{ canon_argv }; + my ($self, $curproc, $command_context) = @_; + my $canon_argv = $command_context->{ canon_argv }; my $domain = $canon_argv->{ ml_name }; my $prefix = $canon_argv->{ options }->[ 0 ]; my $error = ''; @@ -92,7 +92,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2003,2004 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/Command/Admin/newml.pm b/fml/lib/FML/Command/Admin/newml.pm index 132c94ea..78e4877a 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.81 2006/02/04 07:59:24 fukachan Exp $ +# $FML: newml.pm,v 1.82 2006/02/04 08:10:08 fukachan Exp $ # package FML::Command::Admin::newml; @@ -21,7 +21,7 @@ FML::Command::Admin::newml - set up a new mailing list. use FML::Command::Admin::newml; $obj = new FML::Command::Admin::newml; - $obj->newml($curproc, $command_args); + $obj->newml($curproc, $command_context); See C<FML::Command> for more details. @@ -33,7 +33,7 @@ install config.cf, include, include-ctl et. al. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -59,17 +59,17 @@ sub need_lock { 0;} # Descriptions: set up a new mailing list. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: create mailing list directory, # install config.cf, include, include-ctl et. al. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $options = $curproc->command_line_options(); my $config = $curproc->config(); - my $ml_name = $command_args->{ ml_name }; - my $ml_domain = $command_args->{ ml_domain }; + my $ml_name = $command_context->{ ml_name }; + my $ml_domain = $command_context->{ ml_domain }; my $ml_home_prefix = $curproc->ml_home_prefix($ml_domain); my $ml_home_dir = $curproc->ml_home_dir($ml_name, $ml_domain); my $owner = $config->{ newml_command_ml_admin_default_address }|| @@ -108,12 +108,12 @@ sub process # define _ml_name_xxx variables in $parms for virtual domain $control->adjust_params_for_virtual_domain($curproc, - $command_args, + $command_context, $params); # "makefml --force newml elena" creates elena ML even if elena # already exists. - unless ($self->get_force_mode($curproc, $command_args)) { + unless ($self->get_force_mode($curproc, $command_context)) { if (-d $ml_home_dir) { # XXX-TODO: $curproc->logwarn() ? warn("$ml_name ml_home_dir($ml_home_dir) already exists"); @@ -126,7 +126,7 @@ sub process # XXX we assume /etc/passwd exists for backword compatibility # XXX on all unix plathomes. if ($control->is_mta_alias_maps_has_ml_entry($curproc,$params,$ml_name)) { - unless ($self->get_force_mode($curproc, $command_args)) { + unless ($self->get_force_mode($curproc, $command_context)) { # XXX-TODO: $curproc->logwarn() ? warn("$ml_name already exists (somewhere in MTA aliases)"); return ; @@ -142,31 +142,31 @@ sub process # prepare thread cgi interface at ? # ~fml/public_html/cgi-bin/fml/$domain/threadview.cgi ? # 5. prepare listinfo url - $control->init_ml_home_dir($curproc, $command_args, $params); - $control->install_template_files($curproc, $command_args, $params); - if ($self->is_update_alias($curproc, $command_args)) { - $control->update_aliases($curproc, $command_args, $params); + $control->init_ml_home_dir($curproc, $command_context, $params); + $control->install_template_files($curproc, $command_context, $params); + if ($self->is_update_alias($curproc, $command_context)) { + $control->update_aliases($curproc, $command_context, $params); } - $control->setup_mail_archive_dir($curproc, $command_args, $params); - $control->setup_cgi_interface($curproc, $command_args, $params); - $control->setup_listinfo($curproc, $command_args, $params); + $control->setup_mail_archive_dir($curproc, $command_context, $params); + $control->setup_cgi_interface($curproc, $command_context, $params); + $control->setup_listinfo($curproc, $command_context, $params); } # Descriptions: show cgi menu for newml command. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: create home directories, update aliases, ... # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; - # XXX-TODO: $command_args checked ? + # XXX-TODO: $command_context checked ? eval q{ use FML::CGI::ML; my $obj = new FML::CGI::ML; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -176,11 +176,11 @@ sub cgi_menu =head1 UTILITIES -=head2 set_force_mode($curproc, $command_args) +=head2 set_force_mode($curproc, $command_context) set force mode. -=head2 get_force_mode($curproc, $command_args) +=head2 get_force_mode($curproc, $command_context) return if force mode is enabled or not. @@ -188,23 +188,23 @@ return if force mode is enabled or not. # Descriptions: set force mode. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $self. # Return Value: none sub set_force_mode { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; $self->{ _force_mode } = 1; } # Descriptions: return if force mode is enabled or not. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM sub get_force_mode { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $options = $curproc->command_line_options(); if (defined $self->{ _force_mode }) { @@ -217,12 +217,12 @@ sub get_force_mode # Descriptions: check if we should update alias files. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM sub is_update_alias { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $option = $curproc->command_line_cui_specific_options() || {}; if (defined $option->{ 'update-alias' }) { diff --git a/fml/lib/FML/Command/Admin/off.pm b/fml/lib/FML/Command/Admin/off.pm index 295476de..7cacf9b1 100644 --- a/fml/lib/FML/Command/Admin/off.pm +++ b/fml/lib/FML/Command/Admin/off.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004,2005 MURASHITA Takuya +# Copyright (C) 2002,2003,2004,2005,2006 MURASHITA Takuya # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: off.pm,v 1.23 2005/08/17 12:08:44 fukachan Exp $ +# $FML: off.pm,v 1.24 2005/11/30 23:30:38 fukachan Exp $ # package FML::Command::Admin::off; @@ -27,7 +27,7 @@ change delivery mode from real time to digest. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -60,30 +60,30 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: change delivery mode from real time to digest. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); - my $options = $command_args->{ options } || []; - my $address = $command_args->{ command_data } || $options->[ 0 ]; + my $options = $command_context->get_options() || []; + my $address = $command_context->{ command_data } || $options->[ 0 ]; # XXX We should always add/rewrite only $primary_*_map maps via # XXX command mail, CUI and GUI. @@ -133,7 +133,7 @@ sub process eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_del($curproc, $command_args, $uc_args); + $obj->user_del($curproc, $command_context, $uc_args); }; if ($r = $@) { croak($r); @@ -142,18 +142,18 @@ sub process # Descriptions: show cgi menu for off -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -171,7 +171,7 @@ MURASHITA Takuya =head1 COPYRIGHT -Copyright (C) 2002,2003,2004,2005 MURASHITA Takuya +Copyright (C) 2002,2003,2004,2005,2006 MURASHITA Takuya 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/on.pm b/fml/lib/FML/Command/Admin/on.pm index 2f1e14a9..eeed767a 100644 --- a/fml/lib/FML/Command/Admin/on.pm +++ b/fml/lib/FML/Command/Admin/on.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004,2005 MURASHITA Takuya +# Copyright (C) 2002,2003,2004,2005,2006 MURASHITA Takuya # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: on.pm,v 1.23 2005/08/17 12:08:44 fukachan Exp $ +# $FML: on.pm,v 1.24 2005/11/30 23:30:38 fukachan Exp $ # package FML::Command::Admin::on; @@ -27,7 +27,7 @@ change delivery mode from digest to real time. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -60,30 +60,30 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: change delivery mode from digest to real time. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); - my $options = $command_args->{ options } || []; - my $address = $command_args->{ command_data } || $options->[ 0 ] || ''; + my $options = $command_context->get_options() || []; + my $address = $command_context->{ command_data } || $options->[ 0 ] || ''; # XXX We should always add/rewrite only $primary_*_map maps via # XXX command mail, CUI and GUI. @@ -136,7 +136,7 @@ sub process eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_add($curproc, $command_args, $uc_args); + $obj->user_add($curproc, $command_context, $uc_args); }; if ($r = $@) { croak($r); @@ -145,18 +145,18 @@ sub process # Descriptions: show cgi menu for on. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -174,7 +174,7 @@ MURASHITA Takuya =head1 COPYRIGHT -Copyright (C) 2002,2003,2004,2005 MURASHITA Takuya +Copyright (C) 2002,2003,2004,2005,2006 MURASHITA Takuya 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/pass.pm b/fml/lib/FML/Command/Admin/pass.pm index 2579b4a9..6e7eba02 100644 --- a/fml/lib/FML/Command/Admin/pass.pm +++ b/fml/lib/FML/Command/Admin/pass.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2002,2003,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: pass.pm,v 1.5 2003/12/31 03:49:17 fukachan Exp $ +# $FML: pass.pm,v 1.6 2003/12/31 04:08:44 fukachan Exp $ # package FML::Command::Admin::pass; @@ -18,13 +18,13 @@ use FML::Command::Admin::password; # Descriptions: authenticate remote admin password -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to password module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -51,7 +51,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003 Ken'ichi Fukamachi +Copyright (C) 2002,2003,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/Admin/passwd.pm b/fml/lib/FML/Command/Admin/passwd.pm index 5dd07806..977441a2 100644 --- a/fml/lib/FML/Command/Admin/passwd.pm +++ b/fml/lib/FML/Command/Admin/passwd.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2003,2004 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: passwd.pm,v 1.2 2004/01/01 08:41:34 fukachan Exp $ +# $FML: passwd.pm,v 1.3 2004/01/01 08:48:39 fukachan Exp $ # package FML::Command::Admin::passwd; @@ -18,15 +18,15 @@ use FML::Command::Admin::changepassword; # Descriptions: change remote admin password. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to password module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - my $options = $command_args->{ options }; + my ($self, $curproc, $command_context) = @_; + my $options = $command_context->get_options(); - $self->SUPER::process($curproc, $command_args); + $self->SUPER::process($curproc, $command_context); } @@ -53,7 +53,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2003,2004 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/Command/Admin/password.pm b/fml/lib/FML/Command/Admin/password.pm index 0779daa3..70f94bf8 100644 --- a/fml/lib/FML/Command/Admin/password.pm +++ b/fml/lib/FML/Command/Admin/password.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004 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: password.pm,v 1.14 2004/03/04 04:30:13 fukachan Exp $ +# $FML: password.pm,v 1.15 2004/07/23 13:16:35 fukachan Exp $ # package FML::Command::Admin::password; @@ -25,7 +25,7 @@ See C<FML::Command> for more details. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) authenticate the remote admin password. @@ -60,12 +60,12 @@ sub lock_channel { return 'command_serialize';} # Descriptions: rewrite buffer to hide the password phrase in $rbuf. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) STR_REF($rbuf) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) STR_REF($rbuf) # Side Effects: none # Return Value: none sub rewrite_prompt { - my ($self, $curproc, $command_args, $rbuf) = @_; + my ($self, $curproc, $command_context, $rbuf) = @_; if (defined $rbuf) { $$rbuf =~ s/^(.*(password|pass)\s+).*/$1 ********/; @@ -73,7 +73,7 @@ sub rewrite_prompt } -=head2 verify_syntax($curproc, $command_args) +=head2 verify_syntax($curproc, $command_context) verify the syntax command string. return 0 if it looks insecure. @@ -82,15 +82,15 @@ return 0 if it looks insecure. # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; - my $comname = $command_args->{ comname } || ''; - my $comsubname = $command_args->{ comsubname } || ''; - my $options = $command_args->{ options } || []; + my ($self, $curproc, $command_context) = @_; + my $comname = $command_context->get_cooked_command() || ''; + my $comsubname = $command_context->get_cooked_subcommand() || ''; + my $options = $command_context->get_options() || []; my @test = ($comname); # XXX Let original_command be "admin password PASSWORD". @@ -108,7 +108,7 @@ sub verify_syntax use FML::Command; my $dispatch = new FML::Command; - return $dispatch->safe_regexp_match($curproc, $command_args, \@test); + return $dispatch->safe_regexp_match($curproc, $command_context, \@test); } @@ -121,13 +121,13 @@ sub verify_syntax # # [Case 2: makefml/fml command on promt] # -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - my $option = $command_args->{ options } || []; + my ($self, $curproc, $command_context) = @_; + my $option = $command_context->get_options() || []; # XXX Let original_command be "admin password PASSWORD". # XXX $option is shifted before this method called, so [ PASSWORD ] now. @@ -146,7 +146,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2003,2004 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/Command/Admin/remove.pm b/fml/lib/FML/Command/Admin/remove.pm index 82b6652b..a2712fd1 100644 --- a/fml/lib/FML/Command/Admin/remove.pm +++ b/fml/lib/FML/Command/Admin/remove.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,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: remove.pm,v 1.10 2002/12/15 13:46:29 fukachan Exp $ +# $FML: remove.pm,v 1.11 2004/01/02 14:42:42 fukachan Exp $ # package FML::Command::Admin::remove; @@ -18,13 +18,13 @@ use FML::Command::Admin::unsubscribe; # Descriptions: remove the specified member. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to unsubscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -50,7 +50,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +Copyright (C) 2001,2002,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/Command/Admin/resign.pm b/fml/lib/FML/Command/Admin/resign.pm index 8f188dac..a24c8cd2 100644 --- a/fml/lib/FML/Command/Admin/resign.pm +++ b/fml/lib/FML/Command/Admin/resign.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,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: resign.pm,v 1.10 2003/12/31 03:49:17 fukachan Exp $ +# $FML: resign.pm,v 1.11 2003/12/31 04:08:44 fukachan Exp $ # package FML::Command::Admin::resign; @@ -18,13 +18,13 @@ use FML::Command::Admin::unsubscribe; # Descriptions: remove the specified user. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to unsubscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,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/Admin/reviveml.pm b/fml/lib/FML/Command/Admin/reviveml.pm index 632314a1..5a49ba4f 100644 --- a/fml/lib/FML/Command/Admin/reviveml.pm +++ b/fml/lib/FML/Command/Admin/reviveml.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: reviveml.pm,v 1.2 2006/01/09 14:00:54 fukachan Exp $ +# $FML: reviveml.pm,v 1.3 2006/02/15 13:44:03 fukachan Exp $ # package FML::Command::Admin::reviveml; @@ -24,7 +24,7 @@ FML::Command::Admin::reviveml - set up a new mailing list. use FML::Command::Admin::reviveml; $obj = new FML::Command::Admin::reviveml; - $obj->reviveml($curproc, $command_args); + $obj->reviveml($curproc, $command_context); See C<FML::Command> for more details. @@ -36,19 +36,19 @@ install config.cf, include, include-ctl et. al. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut # Descriptions: set up a new mailing list. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: create mailing list directory, # install config.cf, include, include-ctl et. al. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $ml_name = $curproc->ml_name(); my $ml_domain = $curproc->ml_domain(); @@ -67,8 +67,8 @@ sub process $curproc->log("revived ml_home_dir from $ml_home_dir_prev"); } - $self->SUPER::set_force_mode($curproc, $command_args); - $self->SUPER::process($curproc, $command_args); + $self->SUPER::set_force_mode($curproc, $command_context); + $self->SUPER::process($curproc, $command_context); } diff --git a/fml/lib/FML/Command/Admin/rmcopml.pm b/fml/lib/FML/Command/Admin/rmcopml.pm index 1815b13f..560d401b 100644 --- a/fml/lib/FML/Command/Admin/rmcopml.pm +++ b/fml/lib/FML/Command/Admin/rmcopml.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: rmcopml.pm,v 1.1 2006/02/04 08:00:09 fukachan Exp $ +# $FML: rmcopml.pm,v 1.2 2006/02/15 13:44:03 fukachan Exp $ # package FML::Command::Admin::rmcopml; @@ -23,7 +23,7 @@ FML::Command::Admin::rmcopml - disable a new create-on-post mailing list. use FML::Command::Admin::rmcopml; $obj = new FML::Command::Admin::rmcopml; - $obj->rmcopml($curproc, $command_args); + $obj->rmcopml($curproc, $command_context); See C<FML::Command> for more details. @@ -35,7 +35,7 @@ install config.cf, include, include-ctl et. al. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -61,37 +61,37 @@ sub need_lock { 0;} # Descriptions: disable create-on-post mailing list configuration. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: create mailing list directory, # install config.cf, include, include-ctl et. al. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; - $self->SUPER::process($curproc, $command_args); + $self->SUPER::process($curproc, $command_context); use FML::ML::Control; my $control = new FML::ML::Control; $control->set_mode("create-on-post"); - $control->delete_createonpost($curproc, $command_args); + $control->delete_createonpost($curproc, $command_context); } # Descriptions: show cgi menu for rmcopml command. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: create home directories, update aliases, ... # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; - # XXX-TODO: $command_args checked ? + # XXX-TODO: $command_context checked ? eval q{ use FML::CGI::ML; my $obj = new FML::CGI::ML; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -101,11 +101,11 @@ sub cgi_menu =head1 UTILITIES -=head2 set_force_mode($curproc, $command_args) +=head2 set_force_mode($curproc, $command_context) set force mode. -=head2 get_force_mode($curproc, $command_args) +=head2 get_force_mode($curproc, $command_context) return if force mode is enabled or not. @@ -113,23 +113,23 @@ return if force mode is enabled or not. # Descriptions: set force mode. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $self. # Return Value: none sub set_force_mode { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; $self->{ _force_mode } = 1; } # Descriptions: return if force mode is enabled or not. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub get_force_mode { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $options = $curproc->command_line_options(); if (defined $self->{ _force_mode }) { diff --git a/fml/lib/FML/Command/Admin/rmdomain.pm b/fml/lib/FML/Command/Admin/rmdomain.pm index 98d96685..76350eef 100644 --- a/fml/lib/FML/Command/Admin/rmdomain.pm +++ b/fml/lib/FML/Command/Admin/rmdomain.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2003,2004 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: rmdomain.pm,v 1.6 2004/07/23 13:16:36 fukachan Exp $ +# $FML: rmdomain.pm,v 1.7 2004/07/26 01:10:54 fukachan Exp $ # package FML::Command::Admin::rmdomain; @@ -49,13 +49,13 @@ sub need_lock { 0;} # Descriptions: declare discarding this domain. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to dir module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - my $canon_argv = $command_args->{ canon_argv }; + my ($self, $curproc, $command_context) = @_; + my $canon_argv = $command_context->{ canon_argv }; my $domain = $canon_argv->{ ml_name }; if ($domain) { @@ -81,7 +81,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2003,2004 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/Command/Admin/rmml.pm b/fml/lib/FML/Command/Admin/rmml.pm index 5a4230dc..7c1fb13d 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.28 2006/02/04 08:10:08 fukachan Exp $ +# $FML: rmml.pm,v 1.29 2006/02/15 13:44:03 fukachan Exp $ # package FML::Command::Admin::rmml; @@ -21,7 +21,7 @@ FML::Command::Admin::rmml - remove the specified mailing list. use FML::Command::Admin::rmml; $obj = new FML::Command::Admin::rmml; - $obj->rmml($curproc, $command_args); + $obj->rmml($curproc, $command_context); See C<FML::Command> for more details. @@ -33,7 +33,7 @@ and the corresponding alias entries. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -59,17 +59,17 @@ sub need_lock { 0;} # Descriptions: remove the specified mailing list. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: remove mailing list directory and the corresponding # alias entries. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $options = $curproc->command_line_options(); my $config = $curproc->config(); - my $ml_name = $command_args->{ ml_name }; - my $ml_domain = $command_args->{ ml_domain }; + my $ml_name = $command_context->{ ml_name }; + my $ml_domain = $command_context->{ ml_domain }; my $ml_home_prefix = $curproc->ml_home_prefix($ml_domain); my $ml_home_dir = $curproc->ml_home_dir($ml_name, $ml_domain); my $params = { @@ -100,25 +100,25 @@ sub process # o.k. here we go! use FML::ML::Control; my $ml = new FML::ML::Control; - $ml->delete_ml_home_dir($curproc, $command_args, $params); - $ml->delete_aliases($curproc, $command_args, $params); + $ml->delete_ml_home_dir($curproc, $command_context, $params); + $ml->delete_aliases($curproc, $command_context, $params); } # Descriptions: show cgi menu for rmml command. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: create home directories, update aliases, ... # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; # XXX-TODO: $commnad_args checked ? eval q{ use FML::CGI::ML; my $obj = new FML::CGI::ML; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); diff --git a/fml/lib/FML/Command/Admin/signoff.pm b/fml/lib/FML/Command/Admin/signoff.pm index 4705e0f3..c773e6f5 100644 --- a/fml/lib/FML/Command/Admin/signoff.pm +++ b/fml/lib/FML/Command/Admin/signoff.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,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: signoff.pm,v 1.10 2002/12/15 13:46:29 fukachan Exp $ +# $FML: signoff.pm,v 1.11 2004/01/02 14:42:42 fukachan Exp $ # package FML::Command::Admin::signoff; @@ -18,13 +18,13 @@ use FML::Command::Admin::unsubscribe; # Descriptions: remove the specified user. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to unsubscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -50,7 +50,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +Copyright (C) 2001,2002,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/Command/Admin/spool.pm b/fml/lib/FML/Command/Admin/spool.pm index e85d50ae..d8670cca 100644 --- a/fml/lib/FML/Command/Admin/spool.pm +++ b/fml/lib/FML/Command/Admin/spool.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: spool.pm,v 1.8 2005/08/11 04:07:32 fukachan Exp $ +# $FML: spool.pm,v 1.9 2005/08/17 12:08:42 fukachan Exp $ # package FML::Command::Admin::spool; @@ -27,7 +27,7 @@ show spool status or convert the structure. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -60,15 +60,15 @@ sub lock_channel { return 'article_spool_modify';} # Descriptions: subcommand dispatch table for "spool" command. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $c_opts = $curproc->command_line_cui_specific_options() || {}; - my $options = $command_args->{ options }; + my $options = $command_context->get_options(); my $fp = $options->[ 0 ] || 'status'; # prepare arguments on $*_dir directory info. @@ -80,16 +80,16 @@ sub process croak("no such directory: $src_dir") unless -d $src_dir; # prepare command specific parameters - $command_args->{ _src_dir } = $src_dir; - $command_args->{ _dst_dir } = $dst_dir; - $command_args->{ _output_channel } = \*STDOUT; # suppose only makefml. + $command_context->{ _src_dir } = $src_dir; + $command_context->{ _dst_dir } = $dst_dir; + $command_context->{ _output_channel } = \*STDOUT; # suppose only makefml. # here we go. print STDERR "converting $src_dir -> $dst_dir\n"; use FML::Article::Spool; my $spool = new FML::Article::Spool $curproc; if ($spool->can($fp)) { - $spool->$fp($curproc, $command_args); + $spool->$fp($curproc, $command_context); } else { croak("no such method: $fp"); @@ -107,7 +107,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/Command/Admin/subscribe.pm b/fml/lib/FML/Command/Admin/subscribe.pm index b3921a28..51ecd1a6 100644 --- a/fml/lib/FML/Command/Admin/subscribe.pm +++ b/fml/lib/FML/Command/Admin/subscribe.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: subscribe.pm,v 1.33 2005/08/17 10:36:36 fukachan Exp $ +# $FML: subscribe.pm,v 1.34 2005/08/17 12:08:44 fukachan Exp $ # package FML::Command::Admin::subscribe; @@ -27,7 +27,7 @@ subscribe a new address. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) subscribe a new user. @@ -62,29 +62,29 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: subscribe a new user. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); - my $options = $command_args->{ options } || []; - my $address = $command_args->{ command_data } || $options->[ 0 ]; + my $options = $command_context->get_options() || []; + my $address = $command_context->{ command_data } || $options->[ 0 ]; # XXX We should always add/rewrite only $primary_*_map maps via # XXX command mail, CUI and GUI. @@ -119,7 +119,7 @@ sub process eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_add($curproc, $command_args, $uc_args); + $obj->user_add($curproc, $command_context, $uc_args); }; if ($r = $@) { croak($r); @@ -128,19 +128,19 @@ sub process # Descriptions: show cgi menu for subscribe command. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; - # XXX-TODO: $command_args checked ? + # XXX-TODO: $command_context checked ? eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -158,7 +158,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/Command/Admin/summary.pm b/fml/lib/FML/Command/Admin/summary.pm index c0972968..4e84d257 100644 --- a/fml/lib/FML/Command/Admin/summary.pm +++ b/fml/lib/FML/Command/Admin/summary.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: summary.pm,v 1.9 2005/08/11 04:11:27 fukachan Exp $ +# $FML: summary.pm,v 1.10 2005/08/17 12:08:44 fukachan Exp $ # package FML::Command::Admin::summary; @@ -27,7 +27,7 @@ maintain article summary file. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) maintain article summary file. @@ -62,27 +62,27 @@ sub lock_channel { return 'article_spool_modify';} # Descriptions: top level dispatcher to maintain article summary file. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; - $self->_summary($curproc, $command_args); + $self->_summary($curproc, $command_context); } # Descriptions: fmlsummary top level dispacher. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: load FML::Command::command module and execute it. # Return Value: none sub _summary { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $max_id = $curproc->article_get_max_id(); - my $options = $command_args->{ options } || []; + my $options = $command_context->get_options() || []; use FML::Article::Summary; my $summary = new FML::Article::Summary $curproc; @@ -112,7 +112,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/Command/Admin/thread.pm b/fml/lib/FML/Command/Admin/thread.pm index 9da7da2f..b4378e1f 100644 --- a/fml/lib/FML/Command/Admin/thread.pm +++ b/fml/lib/FML/Command/Admin/thread.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: thread.pm,v 1.10 2005/08/17 10:29:33 fukachan Exp $ +# $FML: thread.pm,v 1.11 2005/08/17 12:08:44 fukachan Exp $ # package FML::Command::Admin::thread; @@ -27,7 +27,7 @@ show status article thread or manipulate it. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -60,32 +60,32 @@ sub lock_channel { return 'article_thread';} # Descriptions: thread manipulation interface. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; # attach thread library. use Mail::Message::Thread; my $thargs = $curproc->article_thread_init(); my $thread = new Mail::Message::Thread $thargs; - $self->_new_switch($curproc, $command_args, $thread); + $self->_new_switch($curproc, $command_context, $thread); } # Descriptions: dispatch thread sub-command. # Arguments: OBJ($self) -# OBJ($curproc) HASH_REF($command_args) OBJ($thread) +# OBJ($curproc) OBJ($command_context) OBJ($thread) # Side Effects: update $recipient_map # Return Value: none sub _new_switch { - my ($self, $curproc, $command_args, $thread) = @_; + my ($self, $curproc, $command_context, $thread) = @_; my $config = $curproc->config(); - my $options = $command_args->{ options } || []; + my $options = $command_context->get_options() || []; my $command = $options->[ 0 ] || 'one_line_summary'; my $range = $options->[ 1 ] || ''; my $default_range = 'last:10'; @@ -135,7 +135,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/Command/Admin/unsubscribe.pm b/fml/lib/FML/Command/Admin/unsubscribe.pm index 2dd39273..134f406a 100644 --- a/fml/lib/FML/Command/Admin/unsubscribe.pm +++ b/fml/lib/FML/Command/Admin/unsubscribe.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: unsubscribe.pm,v 1.34 2005/08/17 10:36:37 fukachan Exp $ +# $FML: unsubscribe.pm,v 1.35 2005/08/17 12:08:44 fukachan Exp $ # package FML::Command::Admin::unsubscribe; @@ -27,7 +27,7 @@ remove the specified user. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) remove the specified user. @@ -62,29 +62,29 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; use FML::Command::Syntax; push(@ISA, qw(FML::Command::Syntax)); - $self->check_syntax_address_handler($curproc, $command_args); + $self->check_syntax_address_handler($curproc, $command_context); } # Descriptions: remove the specified user. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); - my $options = $command_args->{ options } || []; - my $address = $command_args->{ command_data } || $options->[ 0 ]; + my $options = $command_context->get_options() || []; + my $address = $command_context->{ command_data } || $options->[ 0 ]; # XXX We should always add/rewrite only $primary_*_map maps via # XXX command mail, CUI and GUI. @@ -113,7 +113,7 @@ sub process eval q{ use FML::User::Control; my $obj = new FML::User::Control; - $obj->user_del($curproc, $command_args, $uc_args); + $obj->user_del($curproc, $command_context, $uc_args); }; if ($r = $@) { croak($r); @@ -122,19 +122,19 @@ sub process # Descriptions: show cgi menu for unsubscribe. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update $member_map $recipient_map # Return Value: none sub cgi_menu { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $r = ''; - # XXX-TODO: $command_args checked ? + # XXX-TODO: $command_context checked ? eval q{ use FML::CGI::User; my $obj = new FML::CGI::User; - $obj->cgi_menu($curproc, $command_args); + $obj->cgi_menu($curproc, $command_context); }; if ($r = $@) { croak($r); @@ -152,7 +152,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/Command/Admin/useradd.pm b/fml/lib/FML/Command/Admin/useradd.pm index aa5fe1ff..f09e59bb 100644 --- a/fml/lib/FML/Command/Admin/useradd.pm +++ b/fml/lib/FML/Command/Admin/useradd.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2004 Ken'ichi Fukamachi +# Copyright (C) 2002,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: useradd.pm,v 1.4 2002/12/15 13:46:29 fukachan Exp $ +# $FML: useradd.pm,v 1.5 2004/01/02 14:42:42 fukachan Exp $ # package FML::Command::Admin::useradd; @@ -18,13 +18,13 @@ use FML::Command::Admin::subscribe; # Descriptions: add a new user. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to subscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2002,2004 Ken'ichi Fukamachi +Copyright (C) 2002,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/Command/Admin/userdel.pm b/fml/lib/FML/Command/Admin/userdel.pm index ae563c76..a41d0130 100644 --- a/fml/lib/FML/Command/Admin/userdel.pm +++ b/fml/lib/FML/Command/Admin/userdel.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,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: userdel.pm,v 1.4 2002/12/15 13:46:29 fukachan Exp $ +# $FML: userdel.pm,v 1.5 2004/01/02 14:42:42 fukachan Exp $ # package FML::Command::Admin::userdel; @@ -18,13 +18,13 @@ use FML::Command::Admin::unsubscribe; # Descriptions: remove the specified user. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to unsubscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -49,7 +49,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2004 Ken'ichi Fukamachi +Copyright (C) 2001,2002,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/Command/User/add.pm b/fml/lib/FML/Command/User/add.pm index a55f0c0b..1a1e2a83 100644 --- a/fml/lib/FML/Command/User/add.pm +++ b/fml/lib/FML/Command/User/add.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,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: add.pm,v 1.11 2003/12/31 03:49:18 fukachan Exp $ +# $FML: add.pm,v 1.12 2003/12/31 04:08:44 fukachan Exp $ # package FML::Command::User::add; @@ -18,13 +18,13 @@ use FML::Command::User::subscribe; # Descriptions: subscribe request, which forwarded to subscribe module. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to subscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -51,7 +51,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,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/User/admin.pm b/fml/lib/FML/Command/User/admin.pm index 68e5bfd1..56b77bdf 100644 --- a/fml/lib/FML/Command/User/admin.pm +++ b/fml/lib/FML/Command/User/admin.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: admin.pm,v 1.14 2005/11/30 23:30:38 fukachan Exp $ +# $FML: admin.pm,v 1.15 2006/03/04 12:56:58 fukachan Exp $ # package FML::Command::User::admin; @@ -41,27 +41,27 @@ sub new # Descriptions: rewrite command prompt. # Always we need to rewrite command prompt to hide password. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) STR_REF($rbuf) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) STR_REF($rbuf) # Side Effects: rewrite buffer to hide the password phrase in $rbuf. # Return Value: none sub rewrite_prompt { - my ($self, $curproc, $command_args, $rbuf) = @_; + my ($self, $curproc, $command_context, $rbuf) = @_; my $command = undef; - my $comname = $command_args->{ comsubname }; + my $comname = $command_context->get_cooked_subcommand(); my $pkg = "FML::Command::Admin::${comname}"; eval qq{ use $pkg; \$command = new $pkg;}; unless ($@) { if ($command->can('rewrite_prompt')) { - return $command->rewrite_prompt($curproc, $command_args, $rbuf); + return $command->rewrite_prompt($curproc, $command_context, $rbuf); } } # XXX-TODO: good style? FML::Command::Admin::password->rewrite_prompt() ? use FML::Command::Admin::password; my $obj = new FML::Command::Admin::password; - $obj->rewrite_prompt($curproc, $command_args, $rbuf); + $obj->rewrite_prompt($curproc, $command_context, $rbuf); } @@ -72,7 +72,7 @@ sub rewrite_prompt sub need_lock { 0;} -=head2 verify_syntax($curproc, $command_args) +=head2 verify_syntax($curproc, $command_context) verify the syntax command string. return 0 if it looks insecure. @@ -81,37 +81,37 @@ return 0 if it looks insecure. # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $command = undef; - my $comname = $command_args->{ comsubname }; + my $comname = $command_context->get_cooked_subcommand(); my $pkg = "FML::Command::Admin::${comname}"; eval qq{ use $pkg; \$command = new $pkg;}; unless ($@) { if ($command->can('verify_syntax')) { - return $command->verify_syntax($curproc, $command_args); + return $command->verify_syntax($curproc, $command_context); } } use FML::Command; my $dispatch = new FML::Command; - return $dispatch->simple_syntax_check($curproc, $command_args); + return $dispatch->simple_syntax_check($curproc, $command_context); } # Descriptions: interface for priviledged command world. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update authentication state if needed. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - my $command = $command_args->{ original_command }; + my ($self, $curproc, $command_context) = @_; + my $command = $command_context->get_command(); # 1. check already authenticated. if not, try auth. # authentication rules are defined as $admin_command_mail_restrictions. @@ -119,7 +119,7 @@ sub process # 1. password auth (one line). # 2. pgp auth (one file). unless ($curproc->command_context_get_admin_auth()) { - my $status = $self->_try_admin_auth($curproc, $command_args); + my $status = $self->_try_admin_auth($curproc, $command_context); if ($status) { $curproc->reply_message_nl("command.admin_auth_ok", "authenticated."); @@ -130,13 +130,13 @@ sub process # 2. run admin command if already authenticated. # if not, fatal error. if ($curproc->command_context_get_admin_auth()) { - my $class = $command_args->{ comsubname } || ''; - $self->_execute_admin_command($curproc, $command_args, $class); + my $class = $command_context->get_cooked_subcommand() || ''; + $self->_execute_admin_command($curproc, $command_context, $class); } else { - my $class = $command_args->{ comsubname } || ''; + my $class = $command_context->get_cooked_subcommand() || ''; my $c = "admin $class ..."; - my $masked_command = $command_args->{ masked_original_command } || $c; + my $masked_command = $command_context->{ masked_original_command } || $c; $curproc->logerror("admin: not auth, cannot run \"$masked_command\""); $curproc->reply_message_nl("command.admin_auth_fail", "not authenticated."); @@ -147,27 +147,27 @@ sub process # Descriptions: authenticate the currrent process sender as an admin. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub _try_admin_auth { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $cred = $curproc->credential(); my $sender = $cred->sender(); my $opt_args = { address => $sender }; - my $class = $command_args->{ comsubname } || ''; + my $class = $command_context->get_cooked_subcommand() || ''; # XXX-TODO: configurable. # prepare() for later use. if ($class eq 'pass' || $class eq 'password') { - $self->_execute_admin_command($curproc, $command_args, $class); + $self->_execute_admin_command($curproc, $command_context, $class); my $p = $curproc->command_context_get_admin_password(); $opt_args->{ password } = $p || ''; } return $self->_apply_new_admin_command_mail_restrictions($curproc, - $command_args, + $command_context, $opt_args); } @@ -175,12 +175,12 @@ sub _try_admin_auth # Descriptions: check if this request is allowed by # $admin_command_mail_restriction. # Arguments: OBJ($self) -# OBJ($curproc) HASH_REF($command_args) HASH_REF($opt_args) +# OBJ($curproc) OBJ($command_context) HASH_REF($opt_args) # Side Effects: none # Return Value: NUM(1 or 0) sub _apply_old_admin_command_mail_restrictions { - my ($self, $curproc, $command_args, $opt_args) = @_; + my ($self, $curproc, $command_context, $opt_args) = @_; my $config = $curproc->config(); my $rules = $config->get_as_array_ref('admin_command_mail_restrictions'); my $is_auth = 0; @@ -212,13 +212,13 @@ sub _apply_old_admin_command_mail_restrictions # Descriptions: check if this request is allowed by # $admin_command_mail_restriction. # Arguments: OBJ($self) -# OBJ($curproc) HASH_REF($command_args) HASH_REF($opt_args) +# OBJ($curproc) OBJ($command_context) HASH_REF($opt_args) # Side Effects: none # Return Value: NUM(1 or 0) sub _apply_new_admin_command_mail_restrictions { - my ($self, $curproc, $command_args, $opt_args) = @_; - my $context = $command_args; + my ($self, $curproc, $command_context, $opt_args) = @_; + my $context = $command_context; my $config = $curproc->config(); my $sender = $opt_args->{ address } || ''; @@ -279,13 +279,13 @@ sub _apply_new_admin_command_mail_restrictions # Descriptions: execute admin command. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) STR($class) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) STR($class) # Side Effects: none # Return Value: none sub _execute_admin_command { - my ($self, $curproc, $command_args, $class) = @_; - my $args = $self->_prepare_command_args($curproc, $command_args); + my ($self, $curproc, $command_context, $class) = @_; + my $args = $self->_prepare_command_args($curproc, $command_context); use FML::Command; my $dispatch = new FML::Command; @@ -293,25 +293,25 @@ sub _execute_admin_command } -# Descriptions: adjust $command_args for admin mode. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Descriptions: adjust $command_context for admin mode. +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub _prepare_command_args { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; - # duplicate $command_args HASH_REF. + # duplicate $command_context HASH_REF. my $args = {}; - for my $k (keys %$command_args) { - $args->{ $k } = $command_args->{ $k }; + for my $k (keys %$command_context) { + $args->{ $k } = $command_context->{ $k }; } $args->{ command_mode } = 'Admin'; # we need to shift "options" by one column in admin command. # e.g. for "admin add some thing", # options = [ add, some, thing ] => [ some, thing ] - my @options = @{ $command_args->{ options } }; + my @options = @{ $command_context->get_options() }; shift @options; $args->{ options } = \@options; @@ -329,7 +329,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/Command/User/bye.pm b/fml/lib/FML/Command/User/bye.pm index 6df155e4..fdde5816 100644 --- a/fml/lib/FML/Command/User/bye.pm +++ b/fml/lib/FML/Command/User/bye.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,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: bye.pm,v 1.12 2003/12/31 03:55:12 fukachan Exp $ +# $FML: bye.pm,v 1.13 2003/12/31 04:08:44 fukachan Exp $ # package FML::Command::User::bye; @@ -18,13 +18,13 @@ use FML::Command::User::unsubscribe; # Descriptions: unsubscribe request, forwarded to "unsubscribe" module. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to unsubscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -51,7 +51,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,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/User/chaddr.pm b/fml/lib/FML/Command/User/chaddr.pm index 8addc54e..895703d4 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.36 2006/01/08 03:06:59 fukachan Exp $ +# $FML: chaddr.pm,v 1.37 2006/01/09 14:00:54 fukachan Exp $ # package FML::Command::User::chaddr; @@ -28,7 +28,7 @@ processed. After confirmation succeeds, chaddr process proceeds. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) If either old or new addresses in chaddr arguments is an ML member, try to confirm this request. The confirmation is returned to "From:" @@ -65,14 +65,14 @@ sub lock_channel { return 'command_serialize';} # Descriptions: verify the syntax command string. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub verify_syntax { - my ($self, $curproc, $command_args) = @_; - my $comname = $command_args->{ comname } || ''; - my $options = $command_args->{ options } || []; + my ($self, $curproc, $command_context) = @_; + my $comname = $command_context->get_cooked_command() || ''; + my $options = $command_context->get_options() || []; my $command = $comname; my $oldaddr = $options->[ 0 ] || ''; my $newaddr = $options->[ 1 ] || ''; @@ -102,7 +102,7 @@ sub verify_syntax use FML::Command; $dispatch = new FML::Command; - if ($dispatch->safe_regexp_match($curproc, $command_args, \@test)) { + if ($dispatch->safe_regexp_match($curproc, $command_context, \@test)) { $ok++; } @@ -111,13 +111,13 @@ sub verify_syntax # Descriptions: chaddr adapter: confirm before real chaddr operation. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update database for confirmation. # prepare reply message. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); @@ -132,8 +132,8 @@ sub process my $recipient_map = $config->{ primary_recipient_map }; my $cache_dir = $config->{ db_dir }; my $keyword = $config->{ confirm_command_prefix }; - my $comname = $command_args->{ comname }; - my $command = $command_args->{ command }; + my $comname = $command_context->get_cooked_command(); + my $command = $command_context->{ command }; my $sender = $cred->sender(); # cheap sanity checks @@ -146,7 +146,7 @@ sub process # addresses we check and send back confirmation messages to my $optargs = {}; - my $x = $command_args->{ command }; + my $x = $command_context->{ command }; $x =~ s/^.*$comname\s+//; my ($old_addr, $new_addr) = split(/\s+/, $x); $optargs->{ recipient } = [ $sender, $old_addr, $new_addr ]; @@ -193,7 +193,7 @@ sub process command => "chaddr", rm_args => $optargs, }; - $_msg->send_confirmation($curproc, $command_args, $confirm, $sc_args); + $_msg->send_confirmation($curproc, $command_context, $confirm, $sc_args); } # try confirmation before chaddr. else { diff --git a/fml/lib/FML/Command/User/confirm.pm b/fml/lib/FML/Command/User/confirm.pm index ea0d1e12..420cf124 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.37 2006/01/08 03:06:59 fukachan Exp $ +# $FML: confirm.pm,v 1.38 2006/01/09 14:00:54 fukachan Exp $ # package FML::Command::User::confirm; @@ -26,7 +26,7 @@ execute the actual corresponding process if the confirmation succeeds. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -59,12 +59,12 @@ sub lock_channel { return 'command_serialize';} # Descriptions: addresses to inform a message copy to. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: ARREY_REF sub notice_cc_recipient { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $maintainer = $config->{ maintainer }; @@ -74,12 +74,12 @@ sub notice_cc_recipient # Descriptions: execute the actual process if this confirmation succeeds. # run _switch_command() for real process. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my ($class, $id); @@ -95,7 +95,7 @@ sub process my $cache_dir = $config->{ db_dir }; my $keyword = $config->{ confirm_command_prefix }; my $expire_limit = $config->{ confirm_expire_limit } || 14*24*3600; - my $command = $command_args->{ command }; + my $command = $command_context->{ command }; # XXX-TODO: sanity @@ -127,7 +127,7 @@ sub process $class, $id, $curproc, - $command_args); + $command_context); } else { # if requset is expired $curproc->reply_message_nl('error.expired', "request expired"); @@ -150,12 +150,12 @@ sub process # switch this process to it. # We support only {subscribe,unsubscribe,chaddr} now. # Arguments: OBJ($self) OBJ($confirm) STR($class) STR($id) -# OBJ($curproc) HASH_REF($command_args) +# OBJ($curproc) OBJ($command_context) # Side Effects: module loaded # Return Value: none sub _switch_process { - my ($self, $confirm, $class, $id, $curproc, $command_args) = @_; + my ($self, $confirm, $class, $id, $curproc, $command_context) = @_; my $config = $curproc->config(); my $command = $class; my $varname = "${command}_command_operation_mode"; @@ -164,29 +164,29 @@ sub _switch_process my $request = $confirm->get_request($id); # pass confirmation id to the command layer. - $command_args->{ _confirm_id } = $id; - $command_args->{ _confirm_address } = $address; - $command_args->{ _confirm_request } = $request; + $command_context->{ _confirm_id } = $id; + $command_context->{ _confirm_address } = $address; + $command_context->{ _confirm_request } = $request; # 1. XXX_command_operation_mode == automatic # fml8 do subscription et.al. automatically. if ($mode eq 'automatic') { - $self->_switch_command($class, $address, $curproc, $command_args); + $self->_switch_command($class, $address, $curproc, $command_context); } # 2. XXX_command_operation_mode == manual # notify "the request is confirmed" to $maintainer, # who do actual subscription et.al. elsif ($mode eq 'manual') { - $self->_forward_request($class, $address, $curproc, $command_args); + $self->_forward_request($class, $address, $curproc, $command_context); } else { croak("unknown operation mode"); } # clean up. - delete $command_args->{ _confirm_id }; - delete $command_args->{ _confirm_address }; - delete $command_args->{ _confirm_request }; + delete $command_context->{ _confirm_id }; + delete $command_context->{ _confirm_address }; + delete $command_context->{ _confirm_request }; } @@ -194,12 +194,12 @@ sub _switch_process # switch this process to it. # We support only {subscribe,unsubscribe,chaddr} now. # Arguments: OBJ($self) STR($class) STR($address) -# OBJ($curproc) HASH_REF($command_args) +# OBJ($curproc) OBJ($command_context) # Side Effects: module loaded # Return Value: none sub _switch_command { - my ($self, $class, $address, $curproc, $command_args) = @_; + my ($self, $class, $address, $curproc, $command_context) = @_; # lower case $class =~ tr/A-Z/a-z/; @@ -215,10 +215,10 @@ sub _switch_command $class eq 'on' || $class eq 'off' || $class eq 'moderate') { - $command_args->{ command_data } = $address; - $command_args->{ command_mode } = 'Admin'; - $command_args->{ override_need_no_lock } = 1; # already locked - $obj->$class($curproc, $command_args); + $command_context->{ command_data } = $address; + $command_context->{ command_mode } = 'Admin'; + $command_context->{ override_need_no_lock } = 1; # already locked + $obj->$class($curproc, $command_context); } else { $curproc->logerror("no such confirmation rule for '$class' command"); @@ -241,7 +241,7 @@ sub _switch_command $config->set( 'welcome_file', $file ); if (-f $file) { - $self->send_user_xxx_message($curproc, $command_args, "welcome"); + $self->send_user_xxx_message($curproc, $command_context, "welcome"); } } @@ -256,18 +256,18 @@ sub _switch_command # switch this process to it. # We support only {subscribe,unsubscribe,chaddr} now. # Arguments: OBJ($self) STR($class) STR($address) -# OBJ($curproc) HASH_REF($command_args) +# OBJ($curproc) OBJ($command_context) # Side Effects: module loaded # Return Value: none sub _forward_request { - my ($self, $class, $address, $curproc, $command_args) = @_; + my ($self, $class, $address, $curproc, $command_context) = @_; my $msg = $curproc->incoming_message(); my $config = $curproc->config(); my $maintainer = $config->{ maintainer }; my $action = "?"; my $command = $class; - my $request = $command_args->{ _confirm_request }; + my $request = $command_context->{ _confirm_request }; my (@address) = split(/\s+/, $address); my $user_args = { recipient => \@address }; my $rm_args = { diff --git a/fml/lib/FML/Command/User/deny.pm b/fml/lib/FML/Command/User/deny.pm index 5b2b51cf..9bb8e43c 100644 --- a/fml/lib/FML/Command/User/deny.pm +++ b/fml/lib/FML/Command/User/deny.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004 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: deny.pm,v 1.12 2004/04/23 04:15:58 fukachan Exp $ +# $FML: deny.pm,v 1.13 2004/06/26 11:47:57 fukachan Exp $ # package FML::Command::User::deny; @@ -29,7 +29,7 @@ See C<FML::Command> for more details. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -55,14 +55,14 @@ sub need_lock { 0;} # Descriptions: send deny message via FML::Command::SendFile. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; - $self->send_user_xxx_message($curproc, $command_args, "deny"); + $self->send_user_xxx_message($curproc, $command_context, "deny"); } @@ -76,7 +76,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004 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/Command/User/digest.pm b/fml/lib/FML/Command/User/digest.pm index 4a946339..584b4c4c 100644 --- a/fml/lib/FML/Command/User/digest.pm +++ b/fml/lib/FML/Command/User/digest.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004,2005 MURASHITA Takuya +# Copyright (C) 2002,2003,2004,2005,2006 MURASHITA Takuya # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: digest.pm,v 1.16 2005/11/30 23:34:45 fukachan Exp $ +# $FML: digest.pm,v 1.17 2005/12/16 13:15:23 fukachan Exp $ # package FML::Command::User::digest; @@ -27,7 +27,7 @@ change delivery mode among real time and digest. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -60,13 +60,13 @@ sub lock_channel { return 'command_serialize';} # Descriptions: digest off/on adapter. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update database for confirmation. # prepare reply message. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); @@ -81,7 +81,7 @@ sub process my $recipient_map = $config->{ primary_recipient_map }; my $cache_dir = $config->{ db_dir }; my $keyword = $config->{ confirm_command_prefix }; - my $command = $command_args->{ command }; + my $command = $command_context->{ command }; my $address = $cred->sender(); my $mode = ''; @@ -107,16 +107,16 @@ sub process $curproc->log("digest $mode"); # emulate options ARRAY_REF. - $command_args->{ command_data } = $address; - $command_args->{ options }->[0] = $address; - $command_args->{ options }->[1] = $mode; + $command_context->{ command_data } = $address; + $command_context->get_options()->[0] = $address; + $command_context->get_options()->[1] = $mode; # XXX-TODO: direct call of Admin::digest is correct? # XXX-TODO: confirmation ? use FML::Command::Admin::digest; my $obj = new FML::Command::Admin::digest; if ($mode eq "on" || $mode eq 'off') { - $obj->process($curproc, $command_args); + $obj->process($curproc, $command_context); } else { my $r = "digest: unknown mode: $mode"; @@ -141,7 +141,7 @@ MURASHITA Takuya =head1 COPYRIGHT -Copyright (C) 2002,2003,2004,2005 MURASHITA Takuya +Copyright (C) 2002,2003,2004,2005,2006 MURASHITA Takuya 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/User/get.pm b/fml/lib/FML/Command/User/get.pm index 975669ba..2181e41e 100644 --- a/fml/lib/FML/Command/User/get.pm +++ b/fml/lib/FML/Command/User/get.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: get.pm,v 1.23 2004/06/26 11:47:58 fukachan Exp $ +# $FML: get.pm,v 1.24 2005/05/27 03:03:35 fukachan Exp $ # package FML::Command::User::get; @@ -60,20 +60,20 @@ sub lock_channel { return 'article_spool_modify';} # Descriptions: check the limit specific to this command. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: NUM(1 or 0) sub check_limit { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $pcb = $curproc->pcb(); my $total = $pcb->get('command', 'get_command_total_num_request') || 0; # 1. check the number of article in one command. my $limit = $config->{ get_command_request_limit } || 10; - my $nreq = $self->num_files_in_send_article_args($curproc, $command_args); - my $name = $command_args->{ comname }; + my $nreq = $self->num_files_in_send_article_args($curproc, $command_context); + my $name = $command_context->get_cooked_command(); my $_args = { _arg_command => $name, }; # 1.1 total number of requested articles. @@ -107,17 +107,17 @@ sub check_limit # command syntax. $options is raw command as ARRAY_REF such as # $options = [ 'get:3', 1, 100 ]; # send_article() called below can parse MH style argument. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; # call send_article() without checking here but # Mail::Message::MH checks and expands the specified targets # to HASH_ARRAY of numbers: [ \d+, \d+, ... ]. - $self->send_article($curproc, $command_args); + $self->send_article($curproc, $command_context); } @@ -131,7 +131,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/Command/User/guide.pm b/fml/lib/FML/Command/User/guide.pm index a81eeafb..8d5944f4 100644 --- a/fml/lib/FML/Command/User/guide.pm +++ b/fml/lib/FML/Command/User/guide.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004 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: guide.pm,v 1.16 2004/04/23 04:15:58 fukachan Exp $ +# $FML: guide.pm,v 1.17 2004/06/26 11:47:58 fukachan Exp $ # package FML::Command::User::guide; @@ -30,7 +30,7 @@ See C<FML::Command> for more details. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -56,14 +56,14 @@ sub need_lock { 0;} # Descriptions: send guide message via FML::Command::SendFile. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; - $self->send_user_xxx_message($curproc, $command_args, "guide"); + $self->send_user_xxx_message($curproc, $command_context, "guide"); } @@ -77,7 +77,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004 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/Command/User/help.pm b/fml/lib/FML/Command/User/help.pm index 8df16112..00f96d67 100644 --- a/fml/lib/FML/Command/User/help.pm +++ b/fml/lib/FML/Command/User/help.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004 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: help.pm,v 1.20 2004/04/23 04:15:58 fukachan Exp $ +# $FML: help.pm,v 1.21 2004/06/26 11:47:58 fukachan Exp $ # package FML::Command::User::help; @@ -30,7 +30,7 @@ See C<FML::Command> for more details. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -56,14 +56,14 @@ sub need_lock { 0;} # Descriptions: send help message via FML::Command::SendFile. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; - $self->send_user_xxx_message($curproc, $command_args, "help"); + $self->send_user_xxx_message($curproc, $command_context, "help"); } @@ -77,7 +77,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004 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/Command/User/info.pm b/fml/lib/FML/Command/User/info.pm index a22d916c..a708a7b8 100644 --- a/fml/lib/FML/Command/User/info.pm +++ b/fml/lib/FML/Command/User/info.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,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: info.pm,v 1.9 2003/12/31 03:49:18 fukachan Exp $ +# $FML: info.pm,v 1.10 2003/12/31 04:08:44 fukachan Exp $ # package FML::Command::User::info; @@ -18,13 +18,13 @@ use FML::Command::User::guide; # Descriptions: send back guide file -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to guide module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -51,7 +51,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,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/User/mget.pm b/fml/lib/FML/Command/User/mget.pm index 470fc81a..e7b3ff6e 100644 --- a/fml/lib/FML/Command/User/mget.pm +++ b/fml/lib/FML/Command/User/mget.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,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: mget.pm,v 1.13 2003/12/31 03:49:18 fukachan Exp $ +# $FML: mget.pm,v 1.14 2003/12/31 04:08:44 fukachan Exp $ # package FML::Command::User::mget; @@ -18,13 +18,13 @@ use FML::Command::User::get; # Descriptions: send back article(s). # The request is forwarded to "get" module. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to get module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -51,7 +51,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,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/User/objective.pm b/fml/lib/FML/Command/User/objective.pm index a1c59396..2a52ef62 100644 --- a/fml/lib/FML/Command/User/objective.pm +++ b/fml/lib/FML/Command/User/objective.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004 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: objective.pm,v 1.12 2004/04/23 04:15:58 fukachan Exp $ +# $FML: objective.pm,v 1.13 2004/06/26 11:47:58 fukachan Exp $ # package FML::Command::User::objective; @@ -29,7 +29,7 @@ See C<FML::Command> for more details. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -55,14 +55,14 @@ sub need_lock { 0;} # Descriptions: send back objective message via FML::Command::SendFile. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; - $self->send_user_xxx_message($curproc, $command_args, "objective"); + $self->send_user_xxx_message($curproc, $command_context, "objective"); } @@ -76,7 +76,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004 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/Command/User/off.pm b/fml/lib/FML/Command/User/off.pm index 7a784da1..f45753f2 100644 --- a/fml/lib/FML/Command/User/off.pm +++ b/fml/lib/FML/Command/User/off.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004,2005 MURASHITA Takuya +# Copyright (C) 2002,2003,2004,2005,2006 MURASHITA Takuya # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: off.pm,v 1.19 2005/11/30 23:30:38 fukachan Exp $ +# $FML: off.pm,v 1.20 2005/11/30 23:34:45 fukachan Exp $ # package FML::Command::User::off; @@ -28,7 +28,7 @@ succeeds. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -62,13 +62,13 @@ sub lock_channel { return 'command_serialize';} # Descriptions: change delivery mode from real time to digest # after confirmation succeeds. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update database for confirmation. # prepare reply message. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); @@ -83,7 +83,7 @@ sub process my $recipient_map = $config->{ primary_recipient_map }; my $cache_dir = $config->{ db_dir }; my $keyword = $config->{ confirm_command_prefix }; - my $command = $command_args->{ command }; + my $command = $command_context->{ command }; my $address = $cred->sender(); # cheap sanity checks @@ -133,7 +133,7 @@ MURASHITA Takuya =head1 COPYRIGHT -Copyright (C) 2002,2003,2004,2005 MURASHITA Takuya +Copyright (C) 2002,2003,2004,2005,2006 MURASHITA Takuya 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/User/on.pm b/fml/lib/FML/Command/User/on.pm index fb873ebc..2e9df071 100644 --- a/fml/lib/FML/Command/User/on.pm +++ b/fml/lib/FML/Command/User/on.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2002,2003,2004,2005 MURASHITA Takuya +# Copyright (C) 2002,2003,2004,2005,2006 MURASHITA Takuya # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: on.pm,v 1.19 2005/11/30 23:30:38 fukachan Exp $ +# $FML: on.pm,v 1.20 2005/11/30 23:34:45 fukachan Exp $ # package FML::Command::User::on; @@ -28,7 +28,7 @@ After confirmation succeeds, on process proceeds. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -62,13 +62,13 @@ sub lock_channel { return 'command_serialize';} # Descriptions: change delivery mode from digest to real time # after confirmation. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update database for confirmation. # prepare reply message. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); @@ -83,7 +83,7 @@ sub process my $recipient_map = $config->{ primary_recipient_map }; my $cache_dir = $config->{ db_dir }; my $keyword = $config->{ confirm_command_prefix }; - my $command = $command_args->{ command }; + my $command = $command_context->{ command }; my $address = $cred->sender(); # fundamental check @@ -135,7 +135,7 @@ MURASHITA Takuya =head1 COPYRIGHT -Copyright (C) 2002,2003,2004,2005 MURASHITA Takuya +Copyright (C) 2002,2003,2004,2005,2006 MURASHITA Takuya 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/User/remove.pm b/fml/lib/FML/Command/User/remove.pm index 8a23384f..1d5806c4 100644 --- a/fml/lib/FML/Command/User/remove.pm +++ b/fml/lib/FML/Command/User/remove.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,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: remove.pm,v 1.12 2003/12/31 03:49:18 fukachan Exp $ +# $FML: remove.pm,v 1.13 2003/12/31 04:08:44 fukachan Exp $ # package FML::Command::User::remove; @@ -18,13 +18,13 @@ use FML::Command::User::unsubscribe; # Descriptions: unsubscribe request, forwarded to "unsubscribe" module. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to unsubscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -51,7 +51,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,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/User/resign.pm b/fml/lib/FML/Command/User/resign.pm index 65f09cc4..5cd9f4b2 100644 --- a/fml/lib/FML/Command/User/resign.pm +++ b/fml/lib/FML/Command/User/resign.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,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: resign.pm,v 1.12 2003/12/31 03:49:18 fukachan Exp $ +# $FML: resign.pm,v 1.13 2003/12/31 04:08:44 fukachan Exp $ # package FML::Command::User::resign; @@ -18,13 +18,13 @@ use FML::Command::User::unsubscribe; # Descriptions: unsubscribe request, forwarded to "unsubscribe" module. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to unsubscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } =head1 NAME @@ -50,7 +50,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,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/User/send.pm b/fml/lib/FML/Command/User/send.pm index 4b646028..1f4fc9ca 100644 --- a/fml/lib/FML/Command/User/send.pm +++ b/fml/lib/FML/Command/User/send.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,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: send.pm,v 1.12 2003/12/31 03:49:18 fukachan Exp $ +# $FML: send.pm,v 1.13 2003/12/31 04:08:45 fukachan Exp $ # package FML::Command::User::send; @@ -17,13 +17,13 @@ use FML::Command::User::get; # Descriptions: send back article(s) -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to get module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -50,7 +50,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,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/User/signoff.pm b/fml/lib/FML/Command/User/signoff.pm index aa568281..39f64391 100644 --- a/fml/lib/FML/Command/User/signoff.pm +++ b/fml/lib/FML/Command/User/signoff.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +# Copyright (C) 2001,2002,2003,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: signoff.pm,v 1.13 2003/12/31 03:49:18 fukachan Exp $ +# $FML: signoff.pm,v 1.14 2003/12/31 04:08:45 fukachan Exp $ # package FML::Command::User::signoff; @@ -18,13 +18,13 @@ use FML::Command::User::unsubscribe; # Descriptions: unsubscribe request, forwarded to "unsubscribe" command. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: forward request to unsubscribe module # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; - $self->SUPER::process($curproc, $command_args); + my ($self, $curproc, $command_context) = @_; + $self->SUPER::process($curproc, $command_context); } @@ -51,7 +51,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi +Copyright (C) 2001,2002,2003,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/User/subscribe.pm b/fml/lib/FML/Command/User/subscribe.pm index 431324fa..f663010b 100644 --- a/fml/lib/FML/Command/User/subscribe.pm +++ b/fml/lib/FML/Command/User/subscribe.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: subscribe.pm,v 1.35 2006/01/07 14:43:25 fukachan Exp $ +# $FML: subscribe.pm,v 1.36 2006/01/08 03:06:59 fukachan Exp $ # package FML::Command::User::subscribe; @@ -28,7 +28,7 @@ After confirmation succeeds, subcribe process proceeds. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -62,13 +62,13 @@ sub lock_channel { return 'command_serialize';} # Descriptions: subscribe adapter. # we confirm it before real subscribe process. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update database for confirmation. # prepare reply message. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); @@ -83,8 +83,8 @@ sub process my $recipient_map = $config->{ primary_recipient_map }; my $cache_dir = $config->{ db_dir }; my $keyword = $config->{ confirm_command_prefix }; - my $command = $command_args->{ command }; - my $options = $command_args->{ options }; + my $command = $command_context->{ command }; + my $options = $command_context->get_options(); my $cui_options = $curproc->command_line_cui_specific_options() || {}; my $address = $cui_options->{ 'send-to' } || $cred->sender(); @@ -131,7 +131,7 @@ sub process use FML::Command::Message; my $_msg = new FML::Command::Message; my $sc_args = { command => "subscribe" }; - $_msg->send_confirmation($curproc, $command_args, $confirm, $sc_args); + $_msg->send_confirmation($curproc, $command_context, $confirm, $sc_args); } } diff --git a/fml/lib/FML/Command/User/summary.pm b/fml/lib/FML/Command/User/summary.pm index bdfdf218..776a0fbc 100644 --- a/fml/lib/FML/Command/User/summary.pm +++ b/fml/lib/FML/Command/User/summary.pm @@ -1,10 +1,10 @@ #-*- perl -*- # -# Copyright (C) 2001,2002,2003,2004 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: summary.pm,v 1.20 2004/04/23 04:15:58 fukachan Exp $ +# $FML: summary.pm,v 1.21 2004/06/26 11:43:42 fukachan Exp $ # package FML::Command::User::summary; @@ -30,7 +30,7 @@ send back summary file. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -63,19 +63,19 @@ sub lock_channel { return 'article_spool_modify';} # Descriptions: send summary file by FML::Command::SendFile. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: none # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $article_summary_file = $config->{ "article_summary_file" }; if (-f $article_summary_file) { - $command_args->{ _filepath_to_send } = $article_summary_file; - $self->send_file($curproc, $command_args); - delete $command_args->{ _filepath_to_send }; + $command_context->{ _filepath_to_send } = $article_summary_file; + $self->send_file($curproc, $command_context); + delete $command_context->{ _filepath_to_send }; } else { $curproc->reply_message_nl('error.no_such_file', @@ -97,7 +97,7 @@ Ken'ichi Fukamachi =head1 COPYRIGHT -Copyright (C) 2001,2002,2003,2004 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/Command/User/unsubscribe.pm b/fml/lib/FML/Command/User/unsubscribe.pm index 726b6ed4..87e1a045 100644 --- a/fml/lib/FML/Command/User/unsubscribe.pm +++ b/fml/lib/FML/Command/User/unsubscribe.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: unsubscribe.pm,v 1.36 2006/01/07 14:43:25 fukachan Exp $ +# $FML: unsubscribe.pm,v 1.37 2006/01/08 03:06:59 fukachan Exp $ # package FML::Command::User::unsubscribe; @@ -28,7 +28,7 @@ After confirmation succeeds, unsubcribe process proceeds. =head1 METHODS -=head2 process($curproc, $command_args) +=head2 process($curproc, $command_context) =cut @@ -61,13 +61,13 @@ sub lock_channel { return 'command_serialize';} # Descriptions: unsubscribe adapter: confirm before unsubscribe. -# Arguments: OBJ($self) OBJ($curproc) HASH_REF($command_args) +# Arguments: OBJ($self) OBJ($curproc) OBJ($command_context) # Side Effects: update database for confirmation. # prepare reply message. # Return Value: none sub process { - my ($self, $curproc, $command_args) = @_; + my ($self, $curproc, $command_context) = @_; my $config = $curproc->config(); my $cred = $curproc->credential(); @@ -82,8 +82,8 @@ sub process my $recipient_map = $config->{ primary_recipient_map }; my $cache_dir = $config->{ db_dir }; my $keyword = $config->{ confirm_command_prefix }; - my $command = $command_args->{ command }; - my $options = $command_args->{ options }; + my $command = $command_context->{ command }; + my $options = $command_context->get_options(); my $cui_options = $curproc->command_line_cui_specific_options() || {}; my $address = $cui_options->{ 'send-to' } || $cred->sender(); @@ -128,7 +128,7 @@ sub process use FML::Command::Message; my $_msg = new FML::Command::Message; my $sc_args = { command => "unsubscribe" }; - $_msg->send_confirmation($curproc, $command_args, $confirm, $sc_args); + $_msg->send_confirmation($curproc, $command_context, $confirm, $sc_args); } } |