From f1d72a4bdb798f7dc735eda05e462c10e52d09b8 Mon Sep 17 00:00:00 2001 From: Viktor Gedzenko Date: Tue, 24 Jun 2014 17:56:19 +0300 Subject: Fixed DOCTYPE in MCHTMLCleaner --- src/core/basetypes/MCHTMLCleaner.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/basetypes/MCHTMLCleaner.cc b/src/core/basetypes/MCHTMLCleaner.cc index 079163bf..81145c9e 100644 --- a/src/core/basetypes/MCHTMLCleaner.cc +++ b/src/core/basetypes/MCHTMLCleaner.cc @@ -43,6 +43,8 @@ String * HTMLCleaner::cleanHTML(String * input) tidyOptSetBool(tdoc, TidyDropEmptyElems, no); #endif tidyOptSetBool(tdoc, TidyXhtmlOut, yes); + tidyOptSetInt(tdoc, TidyDoctypeMode, TidyDoctypeUser); + tidyOptSetBool(tdoc, TidyMark, no); tidySetCharEncoding(tdoc, "utf8"); tidyOptSetBool(tdoc, TidyForceOutput, yes); -- cgit v1.2.3 From 846310cec548559a0fb4037007ca036b5a48abbb Mon Sep 17 00:00:00 2001 From: Viktor Gedzenko Date: Sat, 5 Jul 2014 20:47:15 +0300 Subject: Fixed MessageID property for messages without Message-ID field in header --- src/core/abstract/MCMessageHeader.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/abstract/MCMessageHeader.cc b/src/core/abstract/MCMessageHeader.cc index fb3e43cb..cacd6159 100644 --- a/src/core/abstract/MCMessageHeader.cc +++ b/src/core/abstract/MCMessageHeader.cc @@ -1076,6 +1076,9 @@ void MessageHeader::importIMAPEnvelope(struct mailimap_envelope * env) mailimf_msg_id_free(msgid); } } + else { + setMessageID(NULL); + } } void MessageHeader::importIMAPReferences(Data * data) -- cgit v1.2.3 From 8a27d68b26eec0f85c16109f757caae5e38323f3 Mon Sep 17 00:00:00 2001 From: Viktor Gedzenko Date: Sun, 6 Jul 2014 18:36:20 +0300 Subject: Added hotmail & live domains to outlook provider --- resources/providers.json | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/resources/providers.json b/resources/providers.json index 337a6e85..31e62799 100644 --- a/resources/providers.json +++ b/resources/providers.json @@ -840,7 +840,22 @@ "outlook\\.es", "outlook\\.co\\.th", "outlook\\.com\\.tr", - "outlook\\.com\\.vn" + "outlook\\.com\\.vn", + "hotmail\\.com", + "hotmail\\.co\\.uk", + "hotmail\\.fr", + "hotmail\\.de", + "hotmail\\.be", + "hotmail\\.com\\.ar", + "hotmail\\.es", + "hotmail\\.com\\.mx", + "hotmail\\.com", + "live\\.com", + "live\\.fr", + "live\\.de", + "live\\.be", + "live\\.com\\.ar", + "live\\.com\\.mx" ], "mailboxes":{ "drafts":"Drafts", -- cgit v1.2.3 From 68f2bb15e4249d22f6e7d21c9af803d0dd8d164a Mon Sep 17 00:00:00 2001 From: Viktor Gedzenko Date: Mon, 7 Jul 2014 13:38:02 +0300 Subject: Added mail.ru provider --- resources/providers.json | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/resources/providers.json b/resources/providers.json index 31e62799..09ed7628 100644 --- a/resources/providers.json +++ b/resources/providers.json @@ -919,5 +919,42 @@ "sentmail": "Sent", "trash": "Trash" } + }, + "mailru": { + "servers": { + "imap": [ + { + "port": 143, + "hostname": "imap.mail.ru", + "starttls": true + }, + { + "port": 993, + "hostname": "imap.mail.ru", + "ssl": true + } + ], + "smtp": [ + { + "port": 465, + "hostname": "smtp.mail.ru", + "ssl": true + } + ] + + }, + "domain-match": [ + "mail\\.ru", + "inbox\\.ru", + "list\\.ru", + "bk\\.ru", + "mail\\.ua" + ], + "mailboxes": { + "drafts": "Черновики", + "spam": "Спам", + "sentmail": "Отправленные", + "trash": "Корзина" + } } } -- cgit v1.2.3 From 9d3ead3ce9cf0c747d5b5f55e1c6462a258eba22 Mon Sep 17 00:00:00 2001 From: Viktor Gedzenko Date: Mon, 7 Jul 2014 20:02:33 +0300 Subject: Fixed IMAPQuotaOperation --- src/async/imap/MCIMAPQuotaOperation.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/async/imap/MCIMAPQuotaOperation.cc b/src/async/imap/MCIMAPQuotaOperation.cc index 6744ac4b..2268a384 100644 --- a/src/async/imap/MCIMAPQuotaOperation.cc +++ b/src/async/imap/MCIMAPQuotaOperation.cc @@ -36,6 +36,12 @@ uint32_t IMAPQuotaOperation::usage() void IMAPQuotaOperation::main() { ErrorCode error; + session()->session()->loginIfNeeded(&error); + if (error != ErrorNone) { + setError(error); + return; + } + session()->session()->getQuota(&mUsage, &mLimit, &error); setError(error); } -- cgit v1.2.3 From d31d0deb613f6e2be12de7f87a295e70898ba4c6 Mon Sep 17 00:00:00 2001 From: Viktor Gedzenko Date: Mon, 7 Jul 2014 20:03:04 +0300 Subject: Fixed MCOIMAPCapabilityChildren --- src/core/imap/MCIMAPSession.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc index 09ee841d..780012d4 100755 --- a/src/core/imap/MCIMAPSession.cc +++ b/src/core/imap/MCIMAPSession.cc @@ -3607,6 +3607,10 @@ void IMAPSession::capabilitySetWithSessionState(IndexSet * capabilities) if (mailimap_has_compress_deflate(mImap)) { capabilities->addIndex(IMAPCapabilityCompressDeflate); } + if (mailimap_has_extension(mImap, (char *)"CHILDREN")) { + capabilities->addIndex(IMAPCapabilityChildren); + } + applyCapabilities(capabilities); } -- cgit v1.2.3 From 002afba1ab5de03824c8c773d18259830eec8de5 Mon Sep 17 00:00:00 2001 From: Viktor Gedzenko Date: Wed, 16 Jul 2014 08:22:13 +0300 Subject: Reverted "Fixed MessageID property for messages without Message-ID field in header" This reverts commit 846310cec548559a0fb4037007ca036b5a48abbb. --- src/core/abstract/MCMessageHeader.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/core/abstract/MCMessageHeader.cc b/src/core/abstract/MCMessageHeader.cc index cacd6159..fb3e43cb 100644 --- a/src/core/abstract/MCMessageHeader.cc +++ b/src/core/abstract/MCMessageHeader.cc @@ -1076,9 +1076,6 @@ void MessageHeader::importIMAPEnvelope(struct mailimap_envelope * env) mailimf_msg_id_free(msgid); } } - else { - setMessageID(NULL); - } } void MessageHeader::importIMAPReferences(Data * data) -- cgit v1.2.3