Assembling html mails

1 files changed, 22 insertions, 2 deletions

diff --git a/framework/src/domain/mime/mailtemplates.cpp b/framework/src/domain/mime/mailtemplates.cpp
index dc4f93b5..25ce1385 100644
--- a/framework/src/domain/mime/mailtemplates.cpp
+++ b/framework/src/domain/mime/mailtemplates.cpp
@@ -913,6 +913,13 @@ static KMime::Content *createBodyPart(const QByteArray &body) {
     return mainMessage;
 }
 
+static KMime::Content *createHtmlBodyPart(const QByteArray &body) {
+    auto mainMessage = new KMime::Content;
+    mainMessage->setBody(body);
+    mainMessage->contentType(true)->setMimeType("text/html");
+    return mainMessage;
+}
+
 static KMime::Types::Mailbox::List stringListToMailboxes(const QStringList &list)
 {
     KMime::Types::Mailbox::List mailboxes;
@@ -924,7 +931,7 @@ static KMime::Types::Mailbox::List stringListToMailboxes(const QStringList &list
     return mailboxes;
 }
 
-KMime::Message::Ptr MailTemplates::createMessage(KMime::Message::Ptr existingMessage, const QStringList &to, const QStringList &cc, const QStringList &bcc, const KMime::Types::Mailbox &from, const QString &subject, const QString &body, const QList<Attachment> &attachments, const std::vector<GpgME::Key> &signingKeys)
+KMime::Message::Ptr MailTemplates::createMessage(KMime::Message::Ptr existingMessage, const QStringList &to, const QStringList &cc, const QStringList &bcc, const KMime::Types::Mailbox &from, const QString &subject, const QString &body, bool htmlBody, const QList<Attachment> &attachments, const std::vector<GpgME::Key> &signingKeys)
 {
     auto mail = existingMessage;
     if (!mail) {
@@ -968,12 +975,25 @@ KMime::Message::Ptr MailTemplates::createMessage(KMime::Message::Ptr existingMes
         bodyPart->contentType()->setBoundary(KMime::multiPartBoundary());
         bodyPart->contentTransferEncoding()->setEncoding(KMime::Headers::CE7Bit);
         bodyPart->setPreamble("This is a multi-part message in MIME format.\n");
+        //TODO deal with html
         bodyPart->addContent(createBodyPart(body.toUtf8()));
         for (const auto &attachment : attachments) {
             bodyPart->addContent(createAttachmentPart(attachment.data, attachment.filename, attachment.isInline, attachment.mimeType, attachment.name));
         }
     } else {
-        bodyPart = createBodyPart(body.toUtf8());
+        if (htmlBody) {
+            bodyPart = new KMime::Content;
+            bodyPart->contentType(true)->setMimeType("multipart/alternative");
+            bodyPart->contentType()->setBoundary(KMime::multiPartBoundary());
+
+            QTextDocument doc;
+            doc.setHtml(body);
+
+            bodyPart->addContent(createBodyPart(doc.toPlainText().toUtf8()));
+            bodyPart->addContent(createHtmlBodyPart(body.toUtf8()));
+        } else {
+            bodyPart = createBodyPart(body.toUtf8());
+        }
     }
     bodyPart->assemble();