michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-08-08 00:40:37 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Show mail queue directory

Browse Source
This commit is contained in:
Jamie Cameron
2024-07-02 21:21:21 -07:00
parent e69fb75c8e
commit 37beab77ba
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
postfix/lang/en
View File

@@ -513,6 +513,14 @@ mail_rfc=From line
mail_move=Move to:
mail_eexists=Message no longer exists!
mail_qfile=Mail queue file
mail_qlast=Last retried at
mail_qdir=Mail queue status
mail_qdir_active=Active
mail_qdir_incoming=Incoming
mail_qdir_deferred=Deferred
mail_qdir_corrupt=Corrupt
mail_qdir_hold=On hold
mail_qdir_maildrop=Mail drop
view_title=Read Email
view_desc=Message $1 in $2

5
postfix/postfix-lib.pl
View File

@@ -1505,6 +1505,11 @@ foreach $h (@headers) {
$mail->{'header'}->{lc($h->[0])} = $h->[1];
}
$mail->{'file'} = $file;
my @st = stat($file);
$mail->{'last_retry'} = $st[9];
if ($file =~ /^\Q$config{'mailq_dir'}\E\/([^\/]+)\//) {
$mail->{'mailq_dir'} = $1;
}
return $mail;
}

15
postfix/view_mailq.cgi
View File

@@ -53,8 +53,10 @@ if ($in{'headers'}) {
print &ui_table_row($h->[0],
&html_escape(&decode_mimewords($h->[1])), 1, [ "nowrap" ]);
}
print &ui_table_row($text{'mail_qfile'},
"<tt>".&html_escape($mail->{'file'})."</tt>");
if ($mail->{'file'}) {
print &ui_table_row($text{'mail_qfile'},
"<tt>".&html_escape($mail->{'file'})."</tt>");
}
}
else {
# Just show the most useful headers
@@ -70,6 +72,15 @@ else {
print &ui_table_row($text{'mail_subject'},
&html_escape($mail->{'header'}->{'subject'}));
}
if ($mail->{'last_retry'}) {
print &ui_table_row($text{'mail_qlast'},
&make_date($mail->{'last_retry'}));
}
if ($mail->{'mailq_dir'}) {
print &ui_table_row($text{'mail_qdir'},
$text{'mail_qdir_'.$mail->{'mailq_dir'}} ||
$mail->{'mailq_dir'});
}
print &ui_table_end();
# Find body attachment