diff options
| author | Sadie Powell <sadie@witchery.services> | 2023-07-11 12:28:51 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2023-07-11 12:28:54 +0100 |
| commit | aa619f1eebf23cffefc1d7a1b713a4340508a2d3 (patch) | |
| tree | a54009db81e4b56d0407d7d2e785176548b5a301 /src/mail.cpp | |
| parent | b7458c5da1dc952a29c39fc7c72cbde44ace004f (diff) | |
| parent | e717ac0a89273b7eb50001b4374f3dda2934cd3a (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'src/mail.cpp')
| -rw-r--r-- | src/mail.cpp | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/mail.cpp b/src/mail.cpp index bf53a6c7b..7ad9c75f2 100644 --- a/src/mail.cpp +++ b/src/mail.cpp @@ -13,7 +13,16 @@ #include "mail.h" #include "config.h" -Mail::Message::Message(const Anope::string &sf, const Anope::string &mailto, const Anope::string &a, const Anope::string &s, const Anope::string &m) : Thread(), sendmail_path(Config->GetBlock("mail")->Get<const Anope::string>("sendmailpath")), send_from(sf), mail_to(mailto), addr(a), subject(s), message(m), dont_quote_addresses(Config->GetBlock("mail")->Get<bool>("dontquoteaddresses")) +Mail::Message::Message(const Anope::string &sf, const Anope::string &mailto, const Anope::string &a, const Anope::string &s, const Anope::string &m) + : Thread() + , sendmail_path(Config->GetBlock("mail")->Get<const Anope::string>("sendmailpath")) + , send_from(sf) + , mail_to(mailto) + , addr(a) + , subject(s) + , message(m) + , content_type(Config->GetBlock("mail")->Get<const Anope::string>("content_type", "text/plain; charset=UTF-8")) + , dont_quote_addresses(Config->GetBlock("mail")->Get<bool>("dontquoteaddresses")) { } @@ -35,17 +44,17 @@ void Mail::Message::Run() return; } - fprintf(pipe, "From: %s\n", send_from.c_str()); + fprintf(pipe, "From: %s\r\n", send_from.c_str()); if (this->dont_quote_addresses) - fprintf(pipe, "To: %s <%s>\n", mail_to.c_str(), addr.c_str()); + fprintf(pipe, "To: %s <%s>\r\n", mail_to.c_str(), addr.c_str()); else - fprintf(pipe, "To: \"%s\" <%s>\n", mail_to.c_str(), addr.c_str()); - fprintf(pipe, "Subject: %s\n", subject.c_str()); - fprintf(pipe, "Content-Type: text/plain; charset=UTF-8;\n"); - fprintf(pipe, "Content-Transfer-Encoding: 8bit\n"); - fprintf(pipe, "\n"); + fprintf(pipe, "To: \"%s\" <%s>\r\n", mail_to.c_str(), addr.c_str()); + fprintf(pipe, "Subject: %s\r\n", subject.c_str()); + fprintf(pipe, "Content-Type: %s\r\n", content_type.c_str()); + fprintf(pipe, "Content-Transfer-Encoding: 8bit\r\n"); + fprintf(pipe, "\r\n"); fprintf(pipe, "%s", message.c_str()); - fprintf(pipe, "\n.\n"); + fprintf(pipe, "\r\n.\r\n"); pclose(pipe); |