michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow the primary file to also be home-relative

Browse Source
This commit is contained in:
Jamie Cameron
2025-07-11 00:47:19 -07:00
parent d8166e9a8e
commit 51c86d41d4
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sendmail/autoreply.pl
View File

@@ -107,8 +107,10 @@ $rheader{'Message-Id'} = "<".time().".".$$."\@".$host.">";
$rheader{'Auto-Submitted'} = 'auto-replied'; $rheader{'Auto-Submitted'} = 'auto-replied';
# read the autoreply file (or alternate) # read the autoreply file (or alternate)
if (open(AUTO, "<".$ARGV[0]) || $arfile = &home_file($ARGV[0]);
$ARGV[2] && open(AUTO, "<".$ARGV[2])) { $arfile2 = $ARGV[2] ? &home_file($ARGV[2]) : undef;
if (open(AUTO, "<".$arfile) ||
$arfile2 && open(AUTO, "<".$arfile2)) {
while(<AUTO>) { while(<AUTO>) {
s/\$SUBJECT/$header{'subject'}/g; s/\$SUBJECT/$header{'subject'}/g;
s/\$FROM/$header{'from'}/g; s/\$FROM/$header{'from'}/g;
@@ -154,12 +156,7 @@ if ($header{'x-original-to'} && $rheader{'No-Forward-Reply'}) {
# Open the replies tracking DBM, if one was set # Open the replies tracking DBM, if one was set
my $rtfile = $rheader{'Reply-Tracking'}; my $rtfile = $rheader{'Reply-Tracking'};
if ($rtfile) { if ($rtfile) {
if ($rtfile =~ /^~/) { $rtfile = &home_file($rtfile);
$rtfile =~ s/^~/$ENV{'HOME'}/;
}
if ($rtfile !~ /^\//) {
$rtfile = $ENV{'HOME'}.'/'.$rtfile;
}
$track_replies = dbmopen(%replies, $rtfile, 0700); $track_replies = dbmopen(%replies, $rtfile, 0700);
eval { $replies{"test\@example.com"} = 1; }; eval { $replies{"test\@example.com"} = 1; };
if ($@) { if ($@) {
@@ -487,3 +484,17 @@ else {
return undef; return undef;
} }
} }
# home_file(file)
# If a filename is not absolute, find it relative to the home dir
sub home_file
{
my ($rtfile) = @_;
if ($rtfile =~ /^~/) {
$rtfile =~ s/^~/$ENV{'HOME'}/;
}
if ($rtfile !~ /^\//) {
$rtfile = $ENV{'HOME'}.'/'.$rtfile;
}
return $rtfile;
}