9 |
# |
# |
10 |
# ============================================================ |
# ============================================================ |
11 |
# $Log$ |
# $Log$ |
12 |
|
# Revision 1.7 2003/03/23 22:26:22 root |
13 |
|
# + header-field 'Message-ID' now included when tracing |
14 |
|
# |
15 |
|
# Revision 1.6 2003/03/23 21:12:20 root |
16 |
|
# + sub jerror and related modifications |
17 |
|
# |
18 |
# Revision 1.5 2003/01/30 23:20:21 root |
# Revision 1.5 2003/01/30 23:20:21 root |
19 |
# + fixed and enhanced |
# + fixed and enhanced |
20 |
# |
# |
103 |
$self->{settings}->{RULESFILE} = "$self->{settings}->{HOME}/.dispatchmailrc"; |
$self->{settings}->{RULESFILE} = "$self->{settings}->{HOME}/.dispatchmailrc"; |
104 |
#$self->{settings}->{LOCKFILE} = "$self->{settings}->{HOME}/.procmail.lockfile"; |
#$self->{settings}->{LOCKFILE} = "$self->{settings}->{HOME}/.procmail.lockfile"; |
105 |
$self->{settings}->{LOCKFILE} = "$self->{settings}->{HOME}/.dispatchmail.lockfile"; |
$self->{settings}->{LOCKFILE} = "$self->{settings}->{HOME}/.dispatchmail.lockfile"; |
106 |
$self->{settings}->{LOGFILE} = "$self->{settings}->{MAILDIR}/.dispatchmail.log"; |
$self->{settings}->{LOGFILE} = "$self->{settings}->{MAILDIR}/.mail-delivery.log"; |
107 |
$self->{settings}->{ERRLOG} = ".dispatchmail-errors.log"; |
$self->{settings}->{ERRLOG} = ".mail-delivery_errors.log"; |
108 |
$self->{settings}->{DEFAULT} = "$self->{settings}->{MAILDIR}/Inbox"; |
$self->{settings}->{DEFAULT} = "$self->{settings}->{MAILDIR}/Inbox"; |
109 |
} |
} |
110 |
|
|
154 |
# check if $self->{settings}->{HOME} exists |
# check if $self->{settings}->{HOME} exists |
155 |
if (! -e $self->{settings}->{MAILDIR}) { |
if (! -e $self->{settings}->{MAILDIR}) { |
156 |
my $msg = "ERROR: Delivery failed, base directory '$self->{settings}->{MAILDIR}' does not exist."; |
my $msg = "ERROR: Delivery failed, base directory '$self->{settings}->{MAILDIR}' does not exist."; |
157 |
$self->report($msg); |
$self->jerror($msg); |
|
$self->forward_delivery(); |
|
158 |
} |
} |
159 |
|
|
160 |
# 1. include rules or fallback |
# 1. include rules or fallback |
161 |
# check if $self->{settings}->{RULESFILE} exists |
# check if $self->{settings}->{RULESFILE} exists |
162 |
if (-f $self->{settings}->{RULESFILE}) { |
if (-f $self->{settings}->{RULESFILE}) { |
163 |
$self->report("RULES: Loading from \"$self->{settings}->{RULESFILE}\"."); |
$self->report("RULES: Loading from \"$self->{settings}->{RULESFILE}\"."); |
164 |
require $self->{settings}->{RULESFILE}; |
my $evalstr = "require '$self->{settings}->{RULESFILE}';"; |
165 |
|
eval($evalstr); |
166 |
|
if ($@) { |
167 |
|
my $msg = "ERROR: Delivery failed, '$self->{settings}->{RULESFILE}' had syntax errors:\n$@"; |
168 |
|
$self->jerror($msg); |
169 |
|
} |
170 |
} else { |
} else { |
171 |
#die("$self->{settings}->{RULESFILE} doesn't exist"); |
#die("$self->{settings}->{RULESFILE} doesn't exist"); |
172 |
$self->report("Configured rulesfile \"$self->{settings}->{RULESFILE}\" doesn't exist."); |
$self->jerror("Configured rulesfile \"$self->{settings}->{RULESFILE}\" doesn't exist."); |
|
$self->forward_delivery(); |
|
173 |
} |
} |
174 |
|
|
175 |
# 2. export required stuff to rules namespace |
# 2. export required stuff to rules namespace |
194 |
|
|
195 |
} |
} |
196 |
|
|
197 |
|
sub jerror { |
198 |
|
my $self = shift; |
199 |
|
my $msg = shift; |
200 |
|
$self->report("ERROR: $msg"); |
201 |
|
$self->forward_delivery(); |
202 |
|
} |
203 |
|
|
204 |
sub _mail2news { |
sub _mail2news { |
205 |
my $self = shift; |
my $self = shift; |
217 |
sub traceEntry { |
sub traceEntry { |
218 |
my $self = shift; |
my $self = shift; |
219 |
$self->appendLog('-' x 40 . ' TRACE ' . '-' x 10); |
$self->appendLog('-' x 40 . ' TRACE ' . '-' x 10); |
220 |
$self->appendLog("From: " . get_chomped($self->{incoming}->from)); |
$self->appendLog("From: " . get_chomped($self->{incoming}->from)); |
221 |
$self->appendLog("To: " . get_chomped($self->{incoming}->to)); |
$self->appendLog("To: " . get_chomped($self->{incoming}->to)); |
222 |
$self->appendLog("Subject: " . get_chomped($self->{incoming}->subject)); |
$self->appendLog("Subject: " . get_chomped($self->{incoming}->subject)); |
223 |
|
$self->appendLog("Message-ID: " . get_chomped($self->{incoming}->get('Message-ID'))); |
224 |
$self->appendLog('-' x 40 . ' TRACE ' . '-' x 10); |
$self->appendLog('-' x 40 . ' TRACE ' . '-' x 10); |
225 |
} |
} |
226 |
|
|