major variable naming overhaul

relocating variable definitions in etc/src/

aling rule: e.g. use_XXX XXX_rules XXX_dir XXX_cache_dir

rename:
$recipient_limit -> $smtp_recipient_limit
$incoming_mail_dir -> $incoming_mail_cache_dir
$outgoing_mail_dir -> $outgoing_mail_cache_dir
$qmail_control_virtualdomains_file -> $qmail_virtualdomains_file

s/header_filter/article_header_filter/
s/header_rewrite/article_header_rewrite/
s/body_filter/article_body_filter/

s/subject_tag/article_subject_tag/

verify_XXX_* -> check_XXX

newly defined:
$use_digest_header_rewrite

removed:
$smtp_log_dir
$smtp_log_file

3 files changed, 7 insertions, 25 deletions

diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm
index cb0518fd..9b2d2540 100644
--- a/fml/lib/FML/Process/Distribute.pm
+++ b/fml/lib/FML/Process/Distribute.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2000,2001,2002 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Distribute.pm,v 1.78 2002/05/27 11:20:01 fukachan Exp $
+# $FML: Distribute.pm,v 1.79 2002/06/01 05:09:25 fukachan Exp $
 #
 
 package FML::Process::Distribute;
@@ -397,24 +397,6 @@ sub _deliver_article
 	$handle = $wh;
     }
 
-    if (0) { # debug
-	my $dir = $config->{ smtp_log_dir };
-	use File::Utils qw(mkdirhier);
-	mkdirhier($dir) unless -d $dir;
-
-	my $f = $config->{ smtp_log_file };
-	unlink $f if -f $f;
-	if ($f) {
-	    use FileHandle;
-	    my $fh = new FileHandle "> $f";
-	    if (defined $fh) {
-		$fh->autoflush(1);
-		$sfp = sub { print $fh @_;};
-	    }
-	}
-    }
-
-
     # delay loading of module
     my $service = {};
     eval q{
@@ -435,7 +417,7 @@ sub _deliver_article
 
 			  'smtp_sender'     => $config->{'smtp_sender'},
 			  'recipient_maps'  => $config->{recipient_maps},
-			  'recipient_limit' => $config->{recipient_limit},
+			  'recipient_limit' => $config->{smtp_recipient_limit},
 
 			  'message'         => $message,
 		      });
diff --git a/fml/lib/FML/Process/Error.pm b/fml/lib/FML/Process/Error.pm
index f839d529..2978056a 100644
--- a/fml/lib/FML/Process/Error.pm
+++ b/fml/lib/FML/Process/Error.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2002 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Error.pm,v 1.6 2002/06/01 05:02:33 fukachan Exp $
+# $FML: Error.pm,v 1.7 2002/06/01 05:09:26 fukachan Exp $
 #
 
 package FML::Process::Error;
@@ -239,7 +239,7 @@ sub __open_cache
 {
     my ($curproc) = @_;
     my $config = $curproc->{ config };
-    my $dir    = $config->{ error_cache_dir };
+    my $dir    = $config->{ error_analyzer_cache_dir };
     my $mode   = 'temporal';
     my $days   = 14;
 
diff --git a/fml/lib/FML/Process/Kernel.pm b/fml/lib/FML/Process/Kernel.pm
index d70a8775..c3d1a705 100644
--- a/fml/lib/FML/Process/Kernel.pm
+++ b/fml/lib/FML/Process/Kernel.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Kernel.pm,v 1.104 2002/06/01 04:59:09 fukachan Exp $
+# $FML: Kernel.pm,v 1.105 2002/06/01 05:09:26 fukachan Exp $
 #
 
 package FML::Process::Kernel;
@@ -465,7 +465,7 @@ sub parse_incoming_message
     # save input message for further investigation
     my $config  = $curproc->{ config };
     if ($config->yes('use_incoming_mail_cache')) {
-	my $dir     = $config->{ incoming_mail_dir };
+	my $dir     = $config->{ incoming_mail_cache_dir };
 	my $modulus = $config->{ incoming_mail_cache_size };
         my $obj     = new File::CacheDir {
             directory  => $dir,
@@ -1301,7 +1301,7 @@ sub open_outgoing_message_channel
 
     # save message for further investigation
     if ($config->yes('use_outgoing_mail_cache')) {
-	my $dir     = $config->{ outgoing_mail_dir };
+	my $dir     = $config->{ outgoing_mail_cache_dir };
 	my $modulus = $config->{ outgoing_mail_cache_size };
         my $obj     = new File::CacheDir {
             directory  => $dir,