/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
#include "compose.hpp"
-#include "job.h"
-#include "data.h"
#include "config.h"
#include "emailer.h"
#include "exceptions.h"
#include "i18n.h"
using std::string;
-using std::stringstream;
using std::min;
using std::list;
using std::cout;
using std::pair;
using boost::shared_ptr;
+using dcp::Data;
Emailer::Emailer (string from, list<string> to, string subject, string body)
: _from (from)
, _offset (0)
{
boost::algorithm::replace_all (_body, "\n", "\r\n");
+ boost::algorithm::replace_all (_body, "\0", " ");
}
void
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 (shared_ptr<Job> job)
+Emailer::send (string server, int port, string user, string password)
{
char date_buffer[32];
time_t now = time (0);
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());
- stringstream 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";
}
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());
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 ();
throw NetworkError ("Could not initialise libcurl");
}
- CURLM* mcurl = curl_multi_init ();
- if (!mcurl) {
- throw NetworkError ("Could not initialise libcurl");
- }
+ curl_easy_setopt (curl, CURLOPT_URL, String::compose ("smtp://%1:%2", server.c_str(), port).c_str());
- curl_easy_setopt (curl, CURLOPT_URL, String::compose (
- "smtp://%1:%2",
- Config::instance()->mail_server().c_str(),
- Config::instance()->mail_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());
struct curl_slist* recipients = 0;
BOOST_FOREACH (string i, _to) {
- curl_slist_append (recipients, i.c_str());
+ recipients = curl_slist_append (recipients, i.c_str());
}
BOOST_FOREACH (string i, _cc) {
recipients = curl_slist_append (recipients, i.c_str());
curl_easy_setopt (curl, CURLOPT_DEBUGFUNCTION, curl_debug_shim);
curl_easy_setopt (curl, CURLOPT_DEBUGDATA, this);
- curl_multi_add_handle (mcurl, curl);
-
- time_t start = time (0);
-
- int still_running = 1;
- curl_multi_perform (mcurl, &still_running);
-
- while (still_running) {
-
- fd_set fdread;
- fd_set fdwrite;
- fd_set fdexcep;
-
- FD_ZERO (&fdread);
- FD_ZERO (&fdwrite);
- FD_ZERO (&fdexcep);
-
- struct timeval timeout;
- timeout.tv_sec = 1;
- timeout.tv_usec = 0;
-
- long curl_timeout = -1;
- curl_multi_timeout (mcurl, &curl_timeout);
- if (curl_timeout >= 0) {
- timeout.tv_sec = curl_timeout / 1000;
- if (timeout.tv_sec > 1) {
- timeout.tv_sec = 1;
- } else {
- timeout.tv_usec = (curl_timeout % 1000) * 1000;
- }
- }
-
- int maxfd = -1;
- CURLMcode mc = curl_multi_fdset (mcurl, &fdread, &fdwrite, &fdexcep, &maxfd);
-
- if (mc != CURLM_OK) {
- throw KDMError (String::compose ("Failed to send KDM email to %1", address_list (_to)));
- }
-
- int rc;
- if (maxfd == -1) {
-#ifdef DCPOMATIC_WINDOWS
- Sleep (100);
- rc = 0;
-#else
- struct timeval wait = { 0, 100 * 1000};
- rc = select (0, 0, 0, 0, &wait);
-#endif
- } else {
- rc = select (maxfd + 1, &fdread, &fdwrite, &fdexcep, &timeout);
- }
-
- if (rc < 0) {
- throw KDMError ("Failed to send KDM email");
- }
-
- mc = curl_multi_perform (mcurl, &still_running);
- if (mc != CURLM_OK) {
- throw KDMError (String::compose ("Failed to send KDM email (%1)", curl_multi_strerror (mc)));
- }
-
- if (job) {
- job->set_progress_unknown ();
- }
-
- if ((time(0) - start) > 10) {
- throw KDMError (_("Failed to send KDM email (timed out)"));
- }
+ CURLcode const r = curl_easy_perform (curl);
+ if (r != CURLE_OK) {
+ throw KDMError (String::compose (_("Failed to send email (%1)"), curl_easy_strerror (r)));
}
- int messages;
- do {
- CURLMsg* m = curl_multi_info_read (mcurl, &messages);
- if (m && m->data.result != CURLE_OK) {
- throw KDMError (String::compose ("Failed to send KDM email (%1)", curl_easy_strerror (m->data.result)));
- }
- } while (messages > 0);
-
- /* XXX: we should do this stuff when an exception is thrown, but curl_multi_remove_handle
- seems to hang if we try that.
- */
-
curl_slist_free_all (recipients);
- curl_multi_remove_handle (mcurl, curl);
- curl_multi_cleanup (mcurl);
curl_easy_cleanup (curl);
curl_global_cleanup ();
}
projects / dcpomatic.git / blobdiff