--- nfo/perl/libs/Mail/Audit/Dispatch.pm	2003/01/22 07:54:24	1.2
+++ nfo/perl/libs/Mail/Audit/Dispatch.pm	2003/01/22 07:55:43	1.3
@@ -5,10 +5,13 @@
 #    with the Perl-module "Mail::Audit" 
 #    available from CPAN.
 #
-#  $Id: Dispatch.pm,v 1.2 2003/01/22 07:54:24 joko Exp $
+#  $Id: Dispatch.pm,v 1.3 2003/01/22 07:55:43 joko Exp $
 #
 # ============================================================
 #  $Log: Dispatch.pm,v $
+#  Revision 1.3  2003/01/22 07:55:43  joko
+#  + replaced '$HOME' with '$self->{settings}->{HOME}'
+#
 #  Revision 1.2  2003/01/22 07:54:24  joko
 #  + replaced global variables with class-variables
 #
@@ -80,10 +83,10 @@
   my $self = shift;
   $self->{settings}->{USER}      = $ENV{USER};
   $self->{settings}->{HOME}      = $self->{options}->{base};
-  $self->{settings}->{MAILDIR}   = "$HOME/Mail";
-  $self->{settings}->{RULESFILE} = "$HOME/.dispatchmailrc.pm";
-  #$self->{settings}->{LOCKFILE}  = "$HOME/.procmail.lockfile";
-  $self->{settings}->{LOCKFILE}  = "$HOME/.dispatchmail.lockfile";
+  $self->{settings}->{MAILDIR}   = "$self->{settings}->{HOME}/Mail";
+  $self->{settings}->{RULESFILE} = "$self->{settings}->{HOME}/.dispatchmailrc.pm";
+  #$self->{settings}->{LOCKFILE}  = "$self->{settings}->{HOME}/.procmail.lockfile";
+  $self->{settings}->{LOCKFILE}  = "$self->{settings}->{HOME}/.dispatchmail.lockfile";
   $self->{settings}->{LOGFILE}   = "$self->{settings}->{MAILDIR}/.dispatchmail.log";
   $self->{settings}->{DEFAULT}   = "$self->{settings}->{MAILDIR}/Inbox";
 }
@@ -131,9 +134,9 @@
 
   # 0.b. pre flight checks
 
-     # TODO: check if $HOME is empty
+     # TODO: check if $self->{settings}->{HOME} is empty
 
-     # check if $HOME exists
+     # check if $self->{settings}->{HOME} exists
      if (! -e $self->{settings}->{MAILDIR}) {
        my $msg = "delivery failed, base directory $self->{settings}->{MAILDIR} does not exist";
        report($msg);