mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fix 42863 (pref for enabling env imap prot command), 26735 (respect read-only imap mailboxes) add pref for downloading msg bodies with msg headers for offline imap (15865) r=naving, sr=mscott,sspitzer

This commit is contained in:
bienvenu%netscape.com 2001-03-27 15:22:14 +00:00
Родитель 2daf8f54c2
Коммит 20d5b586dd
5 изменённых файлов: 50 добавлений и 33 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
mailnews/imap/public/nsIImapIncomingServer.idl
Просмотреть файл

@ -67,6 +67,7 @@ interface nsIImapIncomingServer : nsISupports {
attribute boolean storeSentMailInPFC;
boolean getIsPFC(in string folderName);
nsIMsgFolder getPFC(in boolean createIfMissing);
attribute boolean downloadBodiesOnGetNewMail;
void GetImapConnectionAndLoadUrl(in nsIEventQueue aClientEventQueue,
in nsIImapUrl aImapUrl,
in nsISupports aConsumer);

2
mailnews/imap/src/nsImapIncomingServer.cpp
Просмотреть файл

@ -341,6 +341,8 @@ NS_IMPL_SERVERPREF_BOOL(nsImapIncomingServer, StoreReadMailInPFC,
NS_IMPL_SERVERPREF_BOOL(nsImapIncomingServer, StoreSentMailInPFC,
"store_sent_mail_in_pfc");
NS_IMPL_SERVERPREF_BOOL(nsImapIncomingServer, DownloadBodiesOnGetNewMail,
"download_bodies_on_get_new_mail");
//NS_IMPL_SERVERPREF_INT(nsImapIncomingServer, DeleteModel,
// "delete_model");

78
mailnews/imap/src/nsImapProtocol.cpp
Просмотреть файл

@ -93,8 +93,9 @@ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
#define OUTPUT_BUFFER_SIZE (4096*2) // mscott - i should be able to remove this if I can use nsMsgLineBuffer???
//#define IMAP_DB_HEADERS "From To Cc Subject Date Priority X-Priority Message-ID References Newsgroups"
#define IMAP_ENV_HEADERS "From To Cc Subject Date Message-ID"
#define IMAP_DB_HEADERS "Priority X-Priority References Newsgroups"
#define IMAP_ENV_AND_DB_HEADERS IMAP_ENV_HEADERS IMAP_DB_HEADERS
static const PRInt32 kImapSleepTime = 1000000;
static PRInt32 gPromoteNoopToCheckCount = 0;
@ -171,6 +172,7 @@ static PRInt32 gMaxChunkSize = 40960;
static PRBool gInitialized = PR_FALSE;
static PRBool gHideUnusedNamespaces = PR_TRUE;
static PRBool gHideOtherUsersFromList = PR_FALSE;
static PRBool gUseEnvelopeCmd = PR_FALSE;
nsresult nsImapProtocol::GlobalInitialization()
{
@ -189,6 +191,8 @@ nsresult nsImapProtocol::GlobalInitialization()
prefs->GetBoolPref("mail.imap.hide_unused_namespaces",
&gHideUnusedNamespaces);
prefs->GetIntPref("mail.imap.noop_check_count", &gPromoteNoopToCheckCount);
prefs->GetBoolPref("mail.imap.use_envelope_cmd",
&gUseEnvelopeCmd);
}
gInitialized = PR_TRUE;
return rv;
@ -1622,7 +1626,7 @@ char *nsImapProtocol::GetServerCommandTag()
void nsImapProtocol::ProcessSelectedStateURL()
{
char *mailboxName = nsnull;
nsXPIDLCString mailboxName;
PRBool bMessageIdsAreUids = PR_TRUE;
imapMessageFlagsType msgFlags = 0;
const char *hostName = GetImapHostName();
@ -1634,9 +1638,9 @@ void nsImapProtocol::ProcessSelectedStateURL()
m_runningUrl->MessageIdsAreUids(&bMessageIdsAreUids);
m_runningUrl->GetMsgFlags(&msgFlags);
mailboxName = OnCreateServerSourceFolderPathString();
res = CreateServerSourceFolderPathString(getter_Copies(mailboxName));
if (mailboxName && !DeathSignalReceived())
if (NS_SUCCEEDED(res) && !DeathSignalReceived())
{
// OK, code here used to check explicitly for multiple connections to the inbox,
// but the connection pool stuff should handle this now.
@ -1722,6 +1726,12 @@ void nsImapProtocol::ProcessSelectedStateURL()
if (GetServerStateParser().LastCommandSuccessful() && !DeathSignalReceived() && (uidValidityOk || m_imapAction == nsIImapUrl::nsImapDeleteAllMsgs))
{
if (GetServerStateParser().CurrentFolderReadOnly() &&
(m_imapAction == nsIImapUrl::nsImapExpungeFolder || m_imapAction == nsIImapUrl::nsImapDeleteMsg ||
m_imapAction == nsIImapUrl::nsImapDeleteAllMsgs || m_imapAction == nsIImapUrl::nsImapAddMsgFlags ||
m_imapAction == nsIImapUrl::nsImapSubtractMsgFlags))
return;
switch (m_imapAction)
{
case nsIImapUrl::nsImapLiteSelectFolder:
@ -2110,7 +2120,6 @@ void nsImapProtocol::ProcessSelectedStateURL()
break;
}
}
PR_FREEIF( mailboxName);
}
else if (!DeathSignalReceived())
HandleMemoryFailure();
@ -2528,41 +2537,37 @@ nsImapProtocol::FetchMessage(const char * messageIds,
if (/***** Fix me *** gOptimizedHeaders && */// preference -- able to turn it off
useArbitraryHeaders) // if it's ok -- no filters on any header, etc.
{
char *headersToDL = NULL;
char *headersToDL = nsnull;
char *what = nsnull;
const char *dbHeaders = (gUseEnvelopeCmd) ? IMAP_DB_HEADERS : IMAP_ENV_AND_DB_HEADERS;
char *arbitraryHeaders = GetArbitraryHeadersToDownload();
if (arbitraryHeaders)
{
headersToDL = PR_smprintf("%s %s",IMAP_DB_HEADERS,arbitraryHeaders);
headersToDL = PR_smprintf("%s %s",dbHeaders, arbitraryHeaders);
PR_Free(arbitraryHeaders);
}
else
{
if (aolImapServer)
headersToDL = nsCRT::strdup(" XAOL-ENVELOPE INTERNALDATE)");
else
headersToDL = PR_smprintf("%s",IMAP_DB_HEADERS);
}
if (headersToDL)
{
char *what = (!aolImapServer) ? PR_smprintf(" ENVELOPE BODY.PEEK[HEADER.FIELDS (%s)])", headersToDL) : nsCRT::strdup(headersToDL);
if (what)
{
commandString.Append(" %s (UID ");
if (aolImapServer)
commandString.Append(" XAOL.SIZE") ;
else
commandString.Append("RFC822.SIZE");
commandString.Append(" FLAGS");
commandString.Append(what);
PR_Free(what);
}
else
{
commandString.Append(" %s (UID RFC822.SIZE BODY.PEEK[HEADER] FLAGS)");
}
PR_Free(headersToDL);
}
headersToDL = nsCRT::strdup(dbHeaders);
if (aolImapServer)
what = nsCRT::strdup(" XAOL-ENVELOPE INTERNALDATE)");
else if (gUseEnvelopeCmd)
what = PR_smprintf(" ENVELOPE BODY.PEEK[HEADER.FIELDS (%s)])", headersToDL);
else
what = PR_smprintf(" BODY.PEEK[HEADER.FIELDS (%s)])",headersToDL);
nsCRT::free(headersToDL);
if (what)
{
commandString.Append(" %s (UID ");
if (aolImapServer)
commandString.Append(" XAOL.SIZE") ;
else
commandString.Append("RFC822.SIZE");
commandString.Append(" FLAGS");
commandString.Append(what);
PR_Free(what);
}
else
{
commandString.Append(" %s (UID RFC822.SIZE BODY.PEEK[HEADER] FLAGS)");
}
@ -4835,6 +4840,13 @@ char * nsImapProtocol::OnCreateServerSourceFolderPathString()
return sourceMailbox;
}
nsresult nsImapProtocol::CreateServerSourceFolderPathString(char **result)
{
NS_ENSURE_ARG(result);
*result = OnCreateServerSourceFolderPathString();
return (*result) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
}
//caller must free using PR_Free
char * nsImapProtocol::OnCreateServerDestinationFolderPathString()
{

1
mailnews/imap/src/nsImapProtocol.h
Просмотреть файл

@ -459,6 +459,7 @@ private:
void OnAppendMsgFromFile();
char * OnCreateServerSourceFolderPathString();
char * OnCreateServerDestinationFolderPathString();
nsresult CreateServerSourceFolderPathString(char **result);
void OnCreateFolder(const char * aSourceMailbox);
void OnEnsureExistsFolder(const char * aSourceMailbox);
void OnSubscribe(const char * aSourceMailbox);

1
mailnews/imap/src/nsImapServerResponseParser.cpp
Просмотреть файл

@ -1053,6 +1053,7 @@ void nsImapServerResponseParser::msg_fetch()
else if (!PL_strncasecmp(fNextToken, "BODY[HEADER.FIELDS",19))
{
fDownloadingHeaders = PR_TRUE;
BeginMessageDownload(MESSAGE_RFC822); // initialize header parser
// specific message header fields
while (ContinueParse() && fNextToken[nsCRT::strlen(fNextToken)-1] != ']')
fNextToken = GetNextToken();