X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Femailer.cc;h=534856ba61f23613ab684e29969a2036fd1bfd38;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hp=b605d067d9449cace592a40d62027884e2ed100d;hpb=18c3b488dff343a9b287d8d0fd68143b792ec75e;p=dcpomatic.git diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc index b605d067d..534856ba6 100644 --- a/src/lib/emailer.cc +++ b/src/lib/emailer.cc @@ -1,24 +1,24 @@ /* Copyright (C) 2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "compose.hpp" -#include "data.h" #include "config.h" #include "emailer.h" #include "exceptions.h" @@ -35,6 +35,7 @@ using std::list; using std::cout; using std::pair; using boost::shared_ptr; +using dcp::Data; Emailer::Emailer (string from, list to, string subject, string body) : _from (from) @@ -44,6 +45,7 @@ Emailer::Emailer (string from, list to, string subject, string body) , _offset (0) { boost::algorithm::replace_all (_body, "\n", "\r\n"); + boost::algorithm::replace_all (_body, "\0", " "); } void @@ -84,13 +86,13 @@ size_t Emailer::get_data (void* ptr, size_t size, size_t nmemb) { size_t const t = min (_email.length() - _offset, size * nmemb); - memcpy (ptr, _email.substr(_offset, size * nmemb).c_str(), size * nmemb); + memcpy (ptr, _email.substr (_offset, t).c_str(), t); _offset += t; return t; } void -Emailer::send () +Emailer::send (string server, int port, string user, string password) { char date_buffer[32]; time_t now = time (0); @@ -101,18 +103,16 @@ Emailer::send () boost::posix_time::time_duration offset = local_now - utc_now; sprintf (date_buffer + strlen(date_buffer), "%s%02d%02d", (offset.hours() >= 0 ? "+" : "-"), abs (offset.hours()), offset.minutes()); - SafeStringStream email; - - email << "Date: " << date_buffer << "\r\n" - << "To: " << address_list (_to) << "\r\n" - << "From: " << _from << "\r\n"; + _email = "Date: " + string(date_buffer) + "\r\n" + "To: " + address_list (_to) + "\r\n" + "From: " + _from + "\r\n"; if (!_cc.empty ()) { - email << "Cc: " << address_list (_cc); + _email += "Cc: " + address_list (_cc) + "\r\n"; } if (!_bcc.empty ()) { - email << "Bcc: " << address_list (_bcc); + _email += "Bcc: " + address_list (_bcc) + "\r\n"; } string const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; @@ -122,26 +122,26 @@ Emailer::send () } if (!_attachments.empty ()) { - email << "MIME-Version: 1.0\r\n" - << "Content-Type: multipart/mixed; boundary=" << boundary << "\r\n"; + _email += "MIME-Version: 1.0\r\n" + "Content-Type: multipart/mixed; boundary=" + boundary + "\r\n"; } - email << "Subject: " << _subject << "\r\n" - << "User-Agent: DCP-o-matic\r\n" - << "\r\n"; + _email += "Subject: " + _subject + "\r\n" + "User-Agent: DCP-o-matic\r\n" + "\r\n"; if (!_attachments.empty ()) { - email << "--" << boundary << "\r\n" - << "Content-Type: text/plain; charset=utf-8\r\n\r\n"; + _email += "--" + boundary + "\r\n" + + "Content-Type: text/plain; charset=utf-8\r\n\r\n"; } - email << _body; + _email += _body; BOOST_FOREACH (Attachment i, _attachments) { - email << "\r\n\r\n--" << boundary << "\r\n" - << "Content-Type: " << i.mime_type << "; name=" << i.name << "\r\n" - << "Content-Transfer-Encoding: Base64\r\n" - << "Content-Disposition: attachment; filename=" << i.name << "\r\n\r\n"; + _email += "\r\n\r\n--" + boundary + "\r\n" + "Content-Type: " + i.mime_type + "; name=" + i.name + "\r\n" + "Content-Transfer-Encoding: Base64\r\n" + "Content-Disposition: attachment; filename=" + i.name + "\r\n\r\n"; BIO* b64 = BIO_new (BIO_f_base64()); @@ -154,17 +154,15 @@ Emailer::send () char* out; long int bytes = BIO_get_mem_data (bio, &out); - email << string (out, bytes); + _email += string (out, bytes); BIO_free_all (b64); } if (!_attachments.empty ()) { - email << "\r\n--" << boundary << "--\r\n"; + _email += "\r\n--" + boundary + "--\r\n"; } - _email = email.str (); - curl_global_init (CURL_GLOBAL_DEFAULT); CURL* curl = curl_easy_init (); @@ -172,17 +170,13 @@ Emailer::send () throw NetworkError ("Could not initialise libcurl"); } - curl_easy_setopt (curl, CURLOPT_URL, String::compose ( - "smtp://%1:%2", - Config::instance()->mail_server().c_str(), - Config::instance()->mail_port() - ).c_str()); + curl_easy_setopt (curl, CURLOPT_URL, String::compose ("smtp://%1:%2", server.c_str(), port).c_str()); - if (!Config::instance()->mail_user().empty ()) { - curl_easy_setopt (curl, CURLOPT_USERNAME, Config::instance()->mail_user().c_str()); + if (!user.empty ()) { + curl_easy_setopt (curl, CURLOPT_USERNAME, user.c_str ()); } - if (!Config::instance()->mail_password().empty ()) { - curl_easy_setopt (curl, CURLOPT_PASSWORD, Config::instance()->mail_password().c_str()); + if (!password.empty ()) { + curl_easy_setopt (curl, CURLOPT_PASSWORD, password.c_str()); } curl_easy_setopt (curl, CURLOPT_MAIL_FROM, _from.c_str()); @@ -213,7 +207,7 @@ Emailer::send () CURLcode const r = curl_easy_perform (curl); if (r != CURLE_OK) { - throw KDMError (String::compose (_("Failed to send KDM email (%1)"), curl_easy_strerror (r))); + throw KDMError (String::compose (_("Failed to send email (%1)"), curl_easy_strerror (r))); } curl_slist_free_all (recipients);