s/incoming_mail/incoming_message/

9 files changed, 20 insertions, 54 deletions

diff --git a/fml/doc/components.ja.html b/fml/doc/components.ja.html
index d0b38b96..eff94826 100644
--- a/fml/doc/components.ja.html
+++ b/fml/doc/components.ja.html
@@ -35,7 +35,7 @@ $curproc                    FML::Process::Kernel オブジェクト
 
           credential        FML::Credential オブジェクト
 
-          incoming_mail     (単なるキーワード)
+          incoming_message  (単なるキーワード)
                ヘッダ       FML::Header オブジェクト
                メール本文   MailingList::Messages オブジェクト
 
diff --git a/fml/lib/FML/Article.pm b/fml/lib/FML/Article.pm
index 13af3090..47f2eb15 100644
--- a/fml/lib/FML/Article.pm
+++ b/fml/lib/FML/Article.pm
@@ -44,7 +44,7 @@ sub _setup_article_template
     my ($curproc) = @_;
 
     # setup article to distribute
-    my $msg = $curproc->{'incoming_mail'};
+    my $msg = $curproc->{'incoming_message'};
 
     # create an article template by duplicating the incoming message
     $curproc->{ article }->{ header } = $msg->{'header'}->dup();
diff --git a/fml/lib/FML/Config.pm b/fml/lib/FML/Config.pm
index 868bf53c..ba1cf424 100644
--- a/fml/lib/FML/Config.pm
+++ b/fml/lib/FML/Config.pm
@@ -271,9 +271,9 @@ which are mainly hashes.
 		# emulator mode though fml mode in fact
 		emulator => $emulator,
 
-		# struct incoming_mail holds the mail input from STDIN.
-		incoming_mail => $r_msg,
-		article       => $r_msg,
+		# struct incoming_message holds the mail input from STDIN.
+		incoming_message => $r_msg,
+		article          => $r_msg,
 		};
 
 We use r_variable_name syntax where "r_" implies "reference to" here.
diff --git a/fml/lib/FML/PCB.pm b/fml/lib/FML/PCB.pm
index c98ba603..d4e02389 100644
--- a/fml/lib/FML/PCB.pm
+++ b/fml/lib/FML/PCB.pm
@@ -139,9 +139,9 @@ which are mainly hashes.
 		# emulator mode though fml mode in fact
 		emulator => $emulator,
 
-		# struct incoming_mail holds the mail input from STDIN.
-		incoming_mail => $r_msg,
-		article       => $r_msg,
+		# struct incoming_message holds the mail input from STDIN.
+		incoming_message => $r_msg,
+		article          => $r_msg,
 		};
 
 We use r_variable_name syntax where "r_" implies "reference to" here.
diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm
index b4400f50..d997935c 100644
--- a/fml/lib/FML/Process/Distribute.pm
+++ b/fml/lib/FML/Process/Distribute.pm
@@ -245,7 +245,7 @@ incoming mail to elena@fml.org kicks off libexec/distribute via
 libexec/fml.pl, whereas mail to elena-ctl@fml.org kicks off
 libexec/command finally.
 
-   incoming_mail =>
+   incoming_message =>
       elena@fml.org       => fml.pl => libexec/distribute
       elena-ctl@fml.org   => fml.pl => libexec/command
       elena-admin@fml.org => forwarded to administrator(s)
@@ -261,8 +261,8 @@ C<-d>
    |      load configuration files
    |      start logging service
    |
-   |  STDIN                     => FML::Parse
-   |  $CurProc->{'incoming_mail'} <=
+   |  STDIN                           => FML::Parse
+   |  $CurProc->{'incoming_message'} <=
    |  $CurProc->{'credential'}
    | 
    |  (lock)
diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm
index d79b8f6c..2dbd3feb 100644
--- a/fml/lib/FML/Process/Kernel.pm
+++ b/fml/lib/FML/Process/Kernel.pm
@@ -65,7 +65,7 @@ sub new
 sub prepare
 {
     my ($curproc, $args) = @_;
-    $curproc->parse_incoming_mail();
+    $curproc->parse_incoming_message();
 }
 
 
@@ -143,7 +143,7 @@ sub ValidateInComingMail
 sub verify_sender_credential
 {
     my ($curproc, $args) = @_;
-    my $r_msg = $curproc->{'incoming_mail'};
+    my $r_msg = $curproc->{'incoming_message'};
     my $from  = $r_msg->{'header'}->get('from');
 
     use Mail::Address;
@@ -189,7 +189,7 @@ sub load_config_files
 }
 
 
-sub parse_incoming_mail
+sub parse_incoming_message
 {
     my ($curproc, $args) = @_;
 
@@ -200,7 +200,7 @@ sub parse_incoming_mail
     # $r_msg is the reference to the memory area.
     my $r_msg = {};
     ($r_msg->{'header'}, $r_msg->{'body'}) = new FML::Parse $curproc, \*STDIN;
-    $curproc->{'incoming_mail'} = $r_msg;
+    $curproc->{'incoming_message'} = $r_msg;
 }
 
 
diff --git a/fml/lib/FML/Process/TicketSystem.pm b/fml/lib/FML/Process/TicketSystem.pm
index 6486b372..eafeebf6 100644
--- a/fml/lib/FML/Process/TicketSystem.pm
+++ b/fml/lib/FML/Process/TicketSystem.pm
@@ -84,46 +84,12 @@ sub AUTOLOAD
 
 =head1 NAME
 
-distribute -- fml5 article distributer program.
+TicketSystem -- primitive fml5 ticket system
 
 =head1 SYNOPSIS
 
-   distribute [-d] config.cf
-
 =head1 DESCRIPTION
 
-libexec/fml.pl, the wrapper, executes this program. For example, The
-incoming mail to elena@fml.org kicks off libexec/distribute via
-libexec/fml.pl, whereas mail to elena-ctl@fml.org kicks off
-libexec/command finally.
-
-   incoming_mail =>
-      elena@fml.org       => fml.pl => libexec/distribute
-      elena-ctl@fml.org   => fml.pl => libexec/command
-      elena-admin@fml.org => forwarded to administrator(s)
-                                  OR
-                          => libexec/mead
-
-C<-d>
-    debug on.
-
-=head1 FLOW AROUND COMPONENTS
-
-   |  <=> FML::BaseSystem
-   |      load configuration files
-   |      start logging service
-   |
-   |  STDIN                     => FML::Parse
-   |  $CurProc->{'incoming_mail'} <=
-   |  $CurProc->{'credential'}
-   | 
-   |  (lock)
-   |  prepare article
-   |  $CurProc->{'article'} is spooled in.
-   |  $CurProc->{'article'}    <=> Service::SMTP
-   |  (unlock)
-   V
-
 =cut
 
 1;
diff --git a/fml/lib/FML/Ticket/Model/toymodel.pm b/fml/lib/FML/Ticket/Model/toymodel.pm
index c32c484a..10079ffd 100644
--- a/fml/lib/FML/Ticket/Model/toymodel.pm
+++ b/fml/lib/FML/Ticket/Model/toymodel.pm
@@ -178,7 +178,7 @@ sub _update_db
     $rh->{ _articles }->{ $ticket_id }  .= $article_id . " ";
 
     # sender
-    my $header = $curproc->{ incoming_mail }->{ header };
+    my $header = $curproc->{ incoming_message }->{ header };
     $rh->{ _sender }->{ $article_id } = $header->get('from');
 
     # default value of status
diff --git a/fml/libexec/fml b/fml/libexec/fml
index d870c249..292e424d 100755
--- a/fml/libexec/fml
+++ b/fml/libexec/fml
@@ -107,7 +107,7 @@ incoming mail to elena@fml.org kicks off libexec/distribute via
 libexec/fml.pl, whereas mail to elena-ctl@fml.org kicks off
 libexec/command finally.
 
-   incoming_mail =>
+   incoming_message =>
       elena@fml.org       => fml.pl => libexec/distribute
       elena-ctl@fml.org   => fml.pl => libexec/command
       elena-admin@fml.org => forwarded to administrator(s)
@@ -123,8 +123,8 @@ C<-d>
    |      load configuration files
    |      start logging service
    |
-   |  STDIN                     => FML::Parse
-   |  $CurProc->{'incoming_mail'} <=
+   |  STDIN                           => FML::Parse
+   |  $CurProc->{'incoming_message'} <=
    |  $CurProc->{'credential'}
    | 
    |  (lock)