FNF: adjust methond naming convension.

follow changes of FML::User::Control: userXXX() -> user_XXX()

11 files changed, 29 insertions, 29 deletions

diff --git a/fml/lib/FML/Command/Admin/addadmin.pm b/fml/lib/FML/Command/Admin/addadmin.pm
index b6bc7ba9..b9666d9f 100644
--- a/fml/lib/FML/Command/Admin/addadmin.pm
+++ b/fml/lib/FML/Command/Admin/addadmin.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: addadmin.pm,v 1.19 2004/04/28 04:10:35 fukachan Exp $
+# $FML: addadmin.pm,v 1.20 2004/06/26 11:47:55 fukachan Exp $
 #
 
 package FML::Command::Admin::addadmin;
@@ -112,7 +112,7 @@ sub process
     eval q{
 	use FML::User::Control;
 	my $obj = new FML::User::Control;
-	$obj->useradd($curproc, $command_args, $uc_args);
+	$obj->user_add($curproc, $command_args, $uc_args);
     };
     if ($r = $@) {
 	croak($r);
diff --git a/fml/lib/FML/Command/Admin/addmember.pm b/fml/lib/FML/Command/Admin/addmember.pm
index 1dc983b4..1e5f486a 100644
--- a/fml/lib/FML/Command/Admin/addmember.pm
+++ b/fml/lib/FML/Command/Admin/addmember.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: addmember.pm,v 1.2 2004/06/26 11:47:55 fukachan Exp $
+# $FML: addmember.pm,v 1.3 2004/07/23 15:59:03 fukachan Exp $
 #
 
 package FML::Command::Admin::addmember;
@@ -123,7 +123,7 @@ sub process
     eval q{
 	use FML::User::Control;
 	my $obj = new FML::User::Control;
-	$obj->useradd($curproc, $command_args, $uc_args);
+	$obj->user_add($curproc, $command_args, $uc_args);
     };
     if ($r = $@) {
 	croak($r);
diff --git a/fml/lib/FML/Command/Admin/addmoderator.pm b/fml/lib/FML/Command/Admin/addmoderator.pm
index 96a9a285..8f8c0a50 100644
--- a/fml/lib/FML/Command/Admin/addmoderator.pm
+++ b/fml/lib/FML/Command/Admin/addmoderator.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: addmoderator.pm,v 1.14 2004/04/28 04:10:35 fukachan Exp $
+# $FML: addmoderator.pm,v 1.15 2004/06/26 11:47:55 fukachan Exp $
 #
 
 package FML::Command::Admin::addmoderator;
@@ -111,7 +111,7 @@ sub process
     eval q{
 	use FML::User::Control;
 	my $obj = new FML::User::Control;
-	$obj->useradd($curproc, $command_args, $uc_args);
+	$obj->user_add($curproc, $command_args, $uc_args);
     };
     if ($r = $@) {
 	croak($r);
diff --git a/fml/lib/FML/Command/Admin/addrecipient.pm b/fml/lib/FML/Command/Admin/addrecipient.pm
index 37ffa9eb..b5120a25 100644
--- a/fml/lib/FML/Command/Admin/addrecipient.pm
+++ b/fml/lib/FML/Command/Admin/addrecipient.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: addrecipient.pm,v 1.2 2004/06/26 11:47:56 fukachan Exp $
+# $FML: addrecipient.pm,v 1.3 2004/07/23 15:59:03 fukachan Exp $
 #
 
 package FML::Command::Admin::addrecipient;
@@ -123,7 +123,7 @@ sub process
     eval q{
 	use FML::User::Control;
 	my $obj = new FML::User::Control;
-	$obj->useradd($curproc, $command_args, $uc_args);
+	$obj->user_add($curproc, $command_args, $uc_args);
     };
     if ($r = $@) {
 	croak($r);
diff --git a/fml/lib/FML/Command/Admin/deladmin.pm b/fml/lib/FML/Command/Admin/deladmin.pm
index c770ac3b..9ba2b45b 100644
--- a/fml/lib/FML/Command/Admin/deladmin.pm
+++ b/fml/lib/FML/Command/Admin/deladmin.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: deladmin.pm,v 1.18 2004/04/28 04:10:36 fukachan Exp $
+# $FML: deladmin.pm,v 1.19 2004/06/26 11:47:56 fukachan Exp $
 #
 
 package FML::Command::Admin::deladmin;
@@ -113,7 +113,7 @@ sub process
     eval q{
 	use FML::User::Control;
 	my $obj = new FML::User::Control;
-	$obj->userdel($curproc, $command_args, $uc_args);
+	$obj->user_del($curproc, $command_args, $uc_args);
     };
     if ($r = $@) {
 	croak($r);
diff --git a/fml/lib/FML/Command/Admin/delmoderator.pm b/fml/lib/FML/Command/Admin/delmoderator.pm
index 2b508dab..498602b6 100644
--- a/fml/lib/FML/Command/Admin/delmoderator.pm
+++ b/fml/lib/FML/Command/Admin/delmoderator.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: delmoderator.pm,v 1.17 2004/04/28 04:10:36 fukachan Exp $
+# $FML: delmoderator.pm,v 1.18 2004/06/26 11:47:56 fukachan Exp $
 #
 
 package FML::Command::Admin::delmoderator;
@@ -113,7 +113,7 @@ sub process
     eval q{
 	use FML::User::Control;
 	my $obj = new FML::User::Control;
-	$obj->userdel($curproc, $command_args, $uc_args);
+	$obj->user_del($curproc, $command_args, $uc_args);
     };
     if ($r = $@) {
 	croak($r);
diff --git a/fml/lib/FML/Command/Admin/digest.pm b/fml/lib/FML/Command/Admin/digest.pm
index 10902f2c..d870879b 100644
--- a/fml/lib/FML/Command/Admin/digest.pm
+++ b/fml/lib/FML/Command/Admin/digest.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: digest.pm,v 1.21 2004/06/30 03:05:13 fukachan Exp $
+# $FML: digest.pm,v 1.22 2004/07/23 15:59:03 fukachan Exp $
 #
 
 package FML::Command::Admin::digest;
@@ -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->_userdel($curproc, $command_args, $uc_normal_args);
+	$self->_user_del($curproc, $command_args, $uc_normal_args);
     }
     else {
 	my $r = "no such recipient";
@@ -200,7 +200,7 @@ sub _digest_on
 	croak($r);
     }
     else {
-	$self->_useradd($curproc, $command_args, $uc_digest_args);
+	$self->_user_add($curproc, $command_args, $uc_digest_args);
     }
 
     # XXX-TODO: need transaction ?
@@ -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->_userdel($curproc, $command_args, $uc_digest_args);
+	$self->_user_del($curproc, $command_args, $uc_digest_args);
     }
     else {
 	my $r = "no such digest recipient";
@@ -260,7 +260,7 @@ sub _digest_off
 	croak($r);
     }
     else {
-	$self->_useradd($curproc, $command_args, $uc_normal_args);
+	$self->_user_add($curproc, $command_args, $uc_normal_args);
     }
 
     # XXX-TODO: need transaction ?
@@ -272,7 +272,7 @@ sub _digest_off
 #               OBJ($curproc) HASH_REF($command_args) HASH_REF($uc_args)
 # Side Effects: update address list(s).
 # Return Value: none
-sub _useradd
+sub _user_add
 {
     my ($self, $curproc, $command_args, $uc_args) = @_;
     my $r = '';
@@ -280,7 +280,7 @@ sub _useradd
     eval q{
 	use FML::User::Control;
 	my $obj = new FML::User::Control;
-	$obj->useradd($curproc, $command_args, $uc_args);
+	$obj->user_add($curproc, $command_args, $uc_args);
     };
 
     if ($r = $@) {
@@ -294,7 +294,7 @@ sub _useradd
 #               OBJ($curproc) HASH_REF($command_args) HASH_REF($uc_args)
 # Side Effects: update address list(s).
 # Return Value: none
-sub _userdel
+sub _user_del
 {
     my ($self, $curproc, $command_args, $uc_args) = @_;
     my $r = '';
@@ -302,7 +302,7 @@ sub _userdel
     eval q{
 	use FML::User::Control;
 	my $obj = new FML::User::Control;
-	$obj->userdel($curproc, $command_args, $uc_args);
+	$obj->user_del($curproc, $command_args, $uc_args);
     };
 
     if ($r = $@) {
diff --git a/fml/lib/FML/Command/Admin/off.pm b/fml/lib/FML/Command/Admin/off.pm
index f04ecf19..1b09879a 100644
--- a/fml/lib/FML/Command/Admin/off.pm
+++ b/fml/lib/FML/Command/Admin/off.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: off.pm,v 1.20 2004/06/29 10:02:42 fukachan Exp $
+# $FML: off.pm,v 1.21 2004/07/23 15:59:04 fukachan Exp $
 #
 
 package FML::Command::Admin::off;
@@ -133,7 +133,7 @@ sub process
     eval q{
 	use FML::User::Control;
 	my $obj = new FML::User::Control;
-	$obj->userdel($curproc, $command_args, $uc_args);
+	$obj->user_del($curproc, $command_args, $uc_args);
     };
     if ($r = $@) {
 	croak($r);
diff --git a/fml/lib/FML/Command/Admin/on.pm b/fml/lib/FML/Command/Admin/on.pm
index 1df3121f..b9799256 100644
--- a/fml/lib/FML/Command/Admin/on.pm
+++ b/fml/lib/FML/Command/Admin/on.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: on.pm,v 1.20 2004/06/30 03:05:13 fukachan Exp $
+# $FML: on.pm,v 1.21 2004/07/23 15:59:04 fukachan Exp $
 #
 
 package FML::Command::Admin::on;
@@ -136,7 +136,7 @@ sub process
     eval q{
 	use FML::User::Control;
 	my $obj = new FML::User::Control;
-	$obj->useradd($curproc, $command_args, $uc_args);
+	$obj->user_add($curproc, $command_args, $uc_args);
     };
     if ($r = $@) {
 	croak($r);
diff --git a/fml/lib/FML/Command/Admin/subscribe.pm b/fml/lib/FML/Command/Admin/subscribe.pm
index 93ccb2f7..bf61f81b 100644
--- a/fml/lib/FML/Command/Admin/subscribe.pm
+++ b/fml/lib/FML/Command/Admin/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.31 2004/04/28 04:10:37 fukachan Exp $
+# $FML: subscribe.pm,v 1.32 2004/07/23 12:37:37 fukachan Exp $
 #
 
 package FML::Command::Admin::subscribe;
@@ -119,7 +119,7 @@ sub process
     eval q{
 	use FML::User::Control;
 	my $obj = new FML::User::Control;
-	$obj->useradd($curproc, $command_args, $uc_args);
+	$obj->user_add($curproc, $command_args, $uc_args);
     };
     if ($r = $@) {
 	croak($r);
diff --git a/fml/lib/FML/Command/Admin/unsubscribe.pm b/fml/lib/FML/Command/Admin/unsubscribe.pm
index 222ffab7..f8d2d61f 100644
--- a/fml/lib/FML/Command/Admin/unsubscribe.pm
+++ b/fml/lib/FML/Command/Admin/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.32 2004/04/28 04:10:37 fukachan Exp $
+# $FML: unsubscribe.pm,v 1.33 2004/07/23 12:38:22 fukachan Exp $
 #
 
 package FML::Command::Admin::unsubscribe;
@@ -113,7 +113,7 @@ sub process
     eval q{
 	use FML::User::Control;
 	my $obj = new FML::User::Control;
-	$obj->userdel($curproc, $command_args, $uc_args);
+	$obj->user_del($curproc, $command_args, $uc_args);
     };
     if ($r = $@) {
 	croak($r);