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

Maildir skip deleted option

Browse Source
This commit is contained in:
Jamie Cameron
2008-04-26 18:12:12 +00:00
parent 3f4766aac1
commit 32c42d575c
4 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mailboxes/CHANGELOG
View File

@@ -47,3 +47,6 @@ Email cache and index files are now deleted when a user is removed using Webmin.
The number of un-read messages in user folders can be displayed using a new Module Config option (off by default, as there is no fast way to compute this).
---- Changes since 1.400 ----
Fixed a bug that broke searching by message body contents.
---- Changes since 1.410 ----
Re-organized the Module Config page to make the first section less crowded.
Added an option to skip messages flagged as deleted in a Maildir.

7
mailboxes/boxes-lib.pl
View File

@@ -1672,6 +1672,7 @@ foreach my $d ("$_[0]/cur", "$_[0]/new") {
local @dst = stat($d);
$newest = $dst[9] if ($dst[9] > $newest);
}
local $skipt = $config{'maildir_deleted'} || $userconfig{'maildir_deleted'};
local @files;
if (defined($main::list_maildir_cache{$_[0]}) &&
@@ -1698,8 +1699,12 @@ else {
foreach my $d ("cur", "new") {
opendir(DIR, "$_[0]/$d");
while(my $f = readdir(DIR)) {
next if ($f eq "." || $f eq "..");
if ($skipt && $f =~ /:2,([A-Z]*T[A-Z]*)$/) {
# Flagged as deleted by IMAP .. skip
next;
}
push(@shorts, "$d/$f")
if ($f ne "." && $f ne "..");
}
closedir(DIR);
}

1
mailboxes/config
View File

@@ -47,3 +47,4 @@ date_fmt=dmy
arrows=1
open_mode=0
show_unread=0
maildir_deleted=0

31
mailboxes/config.info
View File

@@ -1,28 +1,16 @@
line0=Configurable options,11
line0=User interface options,11
wrap_width=Width to wrap mail messages at,0,6
perpage=Mail messages to display per page,0,6
track_read=Keep track of read/unread emails,1,1-Yes,0-No
show_to=Show To: address in mailboxes?,1,1-Yes,0-No
max_records=Maximum number of users to display,0,6
top_buttons=Show buttons at top for,1,2-Mailboxes and mails,1-Mailboxes only,0-Never
arrows=Show pager arrows at bottom for,1,2-Mailboxes and mails,1-Mailboxes only,0-Never
show_delall=Show button to delete entire mailbox?,1,1-Yes,0-No
show_size=User display mode,1,0-Username only,1-Username and size,2-Full details
show_size_below=       Username and size - Where to display size,1,0-To the right of username,1-Below the username
column_count=Number of columns in which to display usernames,1,3-3,4-4,5-5,6-6,7-7,8-8,9-9
ignore_users=Ignore these usernames (do not show),15,userIgnoreList
ignore_users_enabled=        Ignore list status,1,1-Enabled,0-Disabled
show_count=Show number of messages in inbox?,1,1-Yes,0-No
show_sent=Show number of messages in sent mail folder?,1,1-Yes,0-No
sort_mode=Sort mailboxes by,1,2-Size,1-Username,0-Order in password file
show_mail=Only show users who have mail?,1,1-Yes,0-No
size_mode=Include all folders in size?,1,1-Yes,0-No (first folder only)
fwd_mode=Forward messages with quoting?,1,0-Yes,1-No
delete_warn=Ask for confirmation before deleting?,10,y-Yes,n-No,For mbox files larger than
view_html=Show message body as,4,0-Always plain text,1-Text if possible, HTML otherwise,2-HTML if possible, text otherwise,3-Convert HTML to plain text
html_edit=Use HTML editor for composing?,1,2-Always,1-When replying to HTML email,0-Never
html_quote=HTML quoting mode,1,1-Message below <hr>,0-Message inside <blockquote>
check_mod=Check for mailbox modification when deleting mail?,1,1-Yes,0-No
log_read=Record the reading of mail in the Webmin Actions Log?,1,1-Yes,0-No
bcc_to=Bcc: sent messages to,0
sig_file=Signature file,10,*-None,.signature-~/.signature,Other file
@@ -32,7 +20,24 @@ link_mode=Open links in,1,1-New window,0-Same window
download=Attachment MIME types to always download,9,20,4,\t
date_fmt=Date format in mail list,1,dmy-DD/MM/YYYY,mdy-MM/DD/YYYY,ymd-YYYY/MM/DD
date_tz=Timezone for date displays,3,System default
line0.4=User list options,11
max_records=Maximum number of users to display,0,6
show_size=User display mode,1,0-Username only,1-Username and size,2-Full details
show_size_below=Username and size - Where to display size,1,0-To the right of username,1-Below the username
column_count=Number of columns in which to display usernames,1,3-3,4-4,5-5,6-6,7-7,8-8,9-9
show_count=Show number of messages in inbox?,1,1-Yes,0-No
sort_mode=Sort mailboxes by,1,2-Size,1-Username,0-Order in password file
show_mail=Only show users who have mail?,1,1-Yes,0-No
size_mode=Include all folders in size?,1,1-Yes,0-No (first folder only)
ignore_users=Ignore these usernames (do not show),15,userIgnoreList
ignore_users_enabled=Ignore list status,1,1-Enabled,0-Disabled
line0.5=Folder options,11
track_read=Keep track of read/unread emails,1,1-Yes,0-No
show_unread=Show unread messages count?,1,2-Yes,0-No
check_mod=Check for mailbox modification when deleting mail?,1,1-Yes,0-No
maildir_deleted=Skip messages flagged as deleted in Maildir?,1,1-Yes,0-No
line3=Spam options,11
spam_buttons=Show spam reporting buttons for,2,list-Mailboxes,mail-Messages