sync w/ deladmin codes

1 files changed, 22 insertions, 17 deletions

diff --git a/fml/lib/FML/Command/Admin/delmoderator.pm b/fml/lib/FML/Command/Admin/delmoderator.pm
index a07749a5..784ae222 100644
--- a/fml/lib/FML/Command/Admin/delmoderator.pm
+++ b/fml/lib/FML/Command/Admin/delmoderator.pm
@@ -1,10 +1,10 @@
 #-*- perl -*-
 #
-#  Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi
+#  Copyright (C) 2002,2003 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.5 2002/12/24 10:19:44 fukachan Exp $
+# $FML: delmoderator.pm,v 1.8 2003/01/27 04:36:29 fukachan Exp $
 #
 
 package FML::Command::Admin::delmoderator;
@@ -23,7 +23,7 @@ See C<FML::Command> for more details.
 
 =head1 DESCRIPTION
 
-delmoderator a new user.
+remove the specified moderator.
 
 =head1 METHODS
 
@@ -59,26 +59,31 @@ sub need_lock { 1;}
 sub process
 {
     my ($self, $curproc, $command_args) = @_;
-    my $config        = $curproc->{ config };
+    my $config = $curproc->config();
 
-    #
-    # XXX-TODO: targets are a set of moderator_*_maps
-    #
-    my $member_map    = $config->{ primary_moderator_member_map };
-    my $recipient_map = $config->{ primary_moderator_recipient_map };
-    my $options       = $command_args->{ options };
-    my $address       = $command_args->{ command_data } || $options->[ 0 ];
+    # target maps
+    my $member_maps    = $config->get_as_array_ref('moderator_member_maps');
+    my $recipient_maps = $config->get_as_array_ref('moderator_recipient_maps');
+    my $options        = $command_args->{ options };
+    my $address        = $command_args->{ command_data } || $options->[ 0 ];
 
     # fundamental check
-    croak("address is not undefined")    unless defined $address;
-    croak("member_map is not undefined") unless defined $member_map;
-    croak("address is not specified")    unless $address;
-    croak("member_map is not specified") unless $member_map;
+    croak("address not undefined")        unless defined $address;
+    croak("address not specified")        unless $address;
+    croak("member_maps not undefined")    unless defined $member_maps;
+    croak("member_maps not specified")    unless $member_maps;
+    croak("recipient_maps not undefined") unless defined $recipient_maps;
+    croak("recipient_maps not specified") unless $recipient_maps;
+
+    # maplist
+    my $maplist = [];
+    push(@$maplist, @$member_maps)    if @$member_maps;
+    push(@$maplist, @$recipient_maps) if @$recipient_maps;
 
     # FML::Command::UserControl specific parameters
     my $uc_args = {
 	address => $address,
-	maplist => [ $member_map, $recipient_map ],
+	maplist => $maplist,
     };
     my $r = '';
 
@@ -124,7 +129,7 @@ Ken'ichi Fukamachi
 
 =head1 COPYRIGHT
 
-Copyright (C) 2001,2002,2003 Ken'ichi Fukamachi
+Copyright (C) 2002,2003 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.