VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-16 14:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only peek at IMAP messages, as we set the read flag manually

Browse Source
This commit is contained in:
Jamie Cameron
2008-05-18 21:27:02 +00:00
parent 61e56f1bf9
commit bfe62cfa34
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mailboxes/folders-lib.pl
View File

@ -173,7 +173,7 @@ elsif ($_[2]->{'type'} == 4) {
else {
# Whole messages
@rv = &imap_command($h,
sprintf "FETCH %d:%d (UID FLAGS RFC822)", $start+1, $end+1);
sprintf "FETCH %d:%d (UID FLAGS BODY.PEEK[])", $start+1, $end+1);
}
# Parse the headers or whole messages that came back
@ -447,7 +447,7 @@ elsif ($folder->{'type'} == 4) {
# hitting a the IMAP server's max request limit
local @rv = map { undef } @$ids;
local $wanted = $headersonly ? "(RFC822.SIZE UID FLAGS RFC822.HEADER)"
: "(UID FLAGS RFC822)";
: "(UID FLAGS BODY.PEEK[])";
if (@$ids) {
for(my $chunk=0; $chunk<@$ids; $chunk+=1000) {
local $chunkend = $chunk+999;
@ -2991,23 +2991,13 @@ for(my $i=0; $i<scalar(@rv); $i++) {
if (@needbody) {
local (@needmail, %oldread);
foreach my $i (@needbody) {
local $mail = $mails->[$i];
push(@needmail, $mail);
$oldread{$mail->{'id'}} = &get_mail_read($folder, $mail);
push(@needmail, $mails->[$i]);
}
@needmail = &mailbox_select_mails($folder,
[ map { $_->{'id'} } @needmail ], 0);
foreach my $i (@needbody) {
$mails->[$i] = shift(@needmail);
}
if (defined(&set_mail_read)) {
# Put back original read flag, as the select will clobber it
# on the IMAP server
foreach my $i (@needbody) {
local $mail = $mails->[$i];
&set_mail_read($folder, $mail, $oldread{$mail->{'id'}});
}
}
}
# Now we have bodies, check for attachments