From 41fe85b6248436a1da024e1f9088f045b004acbb Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Mon, 22 Feb 2016 00:15:15 +0800
Subject: [PATCH] Fix malformed date header in email. Closes #4828.

---
 src/base/net/smtp.cpp | 28 +++++++++++++++++++++++++++-
 src/base/net/smtp.h   |  1 +
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/base/net/smtp.cpp b/src/base/net/smtp.cpp
index 23485e18f..3a918933c 100644
--- a/src/base/net/smtp.cpp
+++ b/src/base/net/smtp.cpp
@@ -124,7 +124,7 @@ void Smtp::sendMail(const QString &from, const QString &to, const QString &subje
     const Preferences* const pref = Preferences::instance();
     QTextCodec* latin1 = QTextCodec::codecForName("latin1");
     m_message = "";
-    m_message += encodeMimeHeader("Date", QDateTime::currentDateTime().toUTC().toString("ddd, d MMM yyyy hh:mm:ss UT"), latin1);
+    m_message += "Date: " + getCurrentDateTime().toLatin1() + "\r\n";
     m_message += encodeMimeHeader("From", from, latin1);
     m_message += encodeMimeHeader("Subject", subject, latin1);
     m_message += encodeMimeHeader("To", to, latin1);
@@ -501,3 +501,29 @@ void Smtp::logError(const QString &msg)
     qDebug() << "Email Notification Error:" << msg;
     Logger::instance()->addMessage(tr("Email Notification Error:") + " " + msg, Log::CRITICAL);
 }
+
+QString Smtp::getCurrentDateTime() const
+{
+    // return date & time in the format specified in RFC 2822, section 3.3
+    const QDateTime nowDateTime = QDateTime::currentDateTime();
+    const QDate nowDate = nowDateTime.date();
+    const QLocale eng(QLocale::English);
+
+    QString timeStr = nowDateTime.time().toString("HH:mm:ss");
+    QString weekDayStr = eng.dayName(nowDate.dayOfWeek(), QLocale::ShortFormat);
+    QString dayStr = QString::number(nowDate.day());
+    QString monthStr = eng.monthName(nowDate.month(), QLocale::ShortFormat);
+    QString yearStr = QString::number(nowDate.year());
+
+    QDateTime tmp = nowDateTime;
+    tmp.setTimeSpec(Qt::UTC);
+    int timeOffsetHour = nowDateTime.secsTo(tmp) / 3600;
+    int timeOffsetMin = nowDateTime.secsTo(tmp) / 60 - (60 * timeOffsetHour);
+    int timeOffset = timeOffsetHour * 100 + timeOffsetMin;
+    char buf[6] = {0};
+    std::snprintf(buf, sizeof(buf), "%+05d", timeOffset);
+    QString timeOffsetStr = buf;
+
+    QString ret = weekDayStr + ", " + dayStr + " " + monthStr + " " + yearStr + " " + timeStr + " " + timeOffsetStr;
+    return ret;
+}
diff --git a/src/base/net/smtp.h b/src/base/net/smtp.h
index 4ca441e59..0bd3cb489 100644
--- a/src/base/net/smtp.h
+++ b/src/base/net/smtp.h
@@ -102,6 +102,7 @@ namespace Net
         void authPlain();
         void authLogin();
         void logError(const QString &msg);
+        QString getCurrentDateTime() const;
 
         QByteArray m_message;
 #ifndef QT_NO_OPENSSL