--- /dev/null
+/*
+ Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
+
+ 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.
+
+ 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 DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "compose.hpp"
+#include "config.h"
+#include "email.h"
+#include "exceptions.h"
+#include <curl/curl.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/date_time/c_local_time_adjustor.hpp>
+
+#include "i18n.h"
+
+
+using std::cout;
+using std::min;
+using std::pair;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+using dcp::ArrayData;
+
+
+Email::Email(string from, vector<string> to, string subject, string body)
+ : _from (from)
+ , _to (to)
+ , _subject (subject)
+ , _body (fix (body))
+ , _offset (0)
+{
+
+}
+
+
+string
+Email::fix(string s) const
+{
+ boost::algorithm::replace_all (s, "\n", "\r\n");
+ boost::algorithm::replace_all (s, "\0", " ");
+ return s;
+}
+
+
+void
+Email::add_cc(string cc)
+{
+ _cc.push_back (cc);
+}
+
+
+void
+Email::add_bcc(string bcc)
+{
+ _bcc.push_back (bcc);
+}
+
+
+void
+Email::add_attachment(boost::filesystem::path file, string name, string mime_type)
+{
+ Attachment a;
+ a.file = file;
+ a.name = name;
+ a.mime_type = mime_type;
+ _attachments.push_back (a);
+}
+
+
+static size_t
+curl_data_shim (void* ptr, size_t size, size_t nmemb, void* userp)
+{
+ return reinterpret_cast<Email*>(userp)->get_data (ptr, size, nmemb);
+}
+
+
+static int
+curl_debug_shim (CURL* curl, curl_infotype type, char* data, size_t size, void* userp)
+{
+ return reinterpret_cast<Email*>(userp)->debug (curl, type, data, size);
+}
+
+
+size_t
+Email::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, t).c_str(), t);
+ _offset += t;
+ return t;
+}
+
+
+void
+Email::send(string server, int port, EmailProtocol protocol, string user, string password)
+{
+ char date_buffer[128];
+ time_t now = time (0);
+ strftime (date_buffer, sizeof(date_buffer), "%a, %d %b %Y %H:%M:%S ", localtime(&now));
+
+ auto const utc_now = boost::posix_time::second_clock::universal_time ();
+ auto const local_now = boost::date_time::c_local_adjustor<boost::posix_time::ptime>::utc_to_local (utc_now);
+ auto offset = local_now - utc_now;
+ sprintf (date_buffer + strlen(date_buffer), "%s%02d%02d", (offset.hours() >= 0 ? "+" : "-"), int(abs(offset.hours())), int(offset.minutes()));
+
+ _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) + "\r\n";
+ }
+
+ if (!_bcc.empty()) {
+ _email += "Bcc: " + address_list(_bcc) + "\r\n";
+ }
+
+ string const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
+ string boundary;
+ for (int i = 0; i < 32; ++i) {
+ boundary += chars[rand() % chars.length()];
+ }
+
+ if (!_attachments.empty ()) {
+ _email += "MIME-Version: 1.0\r\n"
+ "Content-Type: multipart/mixed; boundary=" + boundary + "\r\n";
+ }
+
+ _email += "Subject: " + encode_rfc1342(_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 += _body;
+
+ for (auto i: _attachments) {
+ _email += "\r\n\r\n--" + boundary + "\r\n"
+ "Content-Type: " + i.mime_type + "; name=" + encode_rfc1342(i.name) + "\r\n"
+ "Content-Transfer-Encoding: Base64\r\n"
+ "Content-Disposition: attachment; filename=" + encode_rfc1342(i.name) + "\r\n\r\n";
+
+ auto b64 = BIO_new (BIO_f_base64());
+ if (!b64) {
+ throw std::bad_alloc();
+ }
+
+ auto bio = BIO_new (BIO_s_mem());
+ if (!bio) {
+ throw std::bad_alloc();
+ }
+ bio = BIO_push (b64, bio);
+
+ ArrayData data (i.file);
+ BIO_write (bio, data.data(), data.size());
+ (void) BIO_flush (bio);
+
+ char* out;
+ long int bytes = BIO_get_mem_data (bio, &out);
+ _email += fix (string (out, bytes));
+
+ BIO_free_all (b64);
+ }
+
+ if (!_attachments.empty ()) {
+ _email += "\r\n--" + boundary + "--\r\n";
+ }
+
+ curl_global_init (CURL_GLOBAL_DEFAULT);
+
+ auto curl = curl_easy_init ();
+ if (!curl) {
+ throw NetworkError ("Could not initialise libcurl");
+ }
+
+ if ((protocol == EmailProtocol::AUTO && port == 465) || protocol == EmailProtocol::SSL) {
+ /* "SSL" or "Implicit TLS"; I think curl wants us to use smtps here */
+ curl_easy_setopt (curl, CURLOPT_URL, String::compose("smtps://%1:%2", server, port).c_str());
+ } else {
+ curl_easy_setopt (curl, CURLOPT_URL, String::compose("smtp://%1:%2", server, port).c_str());
+ }
+
+ if (!user.empty ()) {
+ curl_easy_setopt (curl, CURLOPT_USERNAME, user.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 = nullptr;
+ for (auto i: _to) {
+ recipients = curl_slist_append (recipients, i.c_str());
+ }
+ for (auto i: _cc) {
+ recipients = curl_slist_append (recipients, i.c_str());
+ }
+ for (auto i: _bcc) {
+ recipients = curl_slist_append (recipients, i.c_str());
+ }
+
+ curl_easy_setopt (curl, CURLOPT_MAIL_RCPT, recipients);
+
+ curl_easy_setopt (curl, CURLOPT_READFUNCTION, curl_data_shim);
+ curl_easy_setopt (curl, CURLOPT_READDATA, this);
+ curl_easy_setopt (curl, CURLOPT_UPLOAD, 1L);
+
+ if (protocol == EmailProtocol::AUTO || protocol == EmailProtocol::STARTTLS) {
+ curl_easy_setopt (curl, CURLOPT_USE_SSL, (long) CURLUSESSL_TRY);
+ }
+ curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0L);
+ curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0L);
+ curl_easy_setopt (curl, CURLOPT_VERBOSE, 1L);
+ curl_easy_setopt (curl, CURLOPT_DEBUGFUNCTION, curl_debug_shim);
+ curl_easy_setopt (curl, CURLOPT_DEBUGDATA, this);
+
+ auto const r = curl_easy_perform (curl);
+ if (r != CURLE_OK) {
+ throw NetworkError (_("Failed to send email"), string(curl_easy_strerror(r)));
+ }
+
+ curl_slist_free_all (recipients);
+ curl_easy_cleanup (curl);
+ curl_global_cleanup ();
+}
+
+
+string
+Email::address_list(vector<string> addresses)
+{
+ string o;
+ for (auto i: addresses) {
+ o += i + ", ";
+ }
+
+ return o.substr (0, o.length() - 2);
+}
+
+
+int
+Email::debug(CURL *, curl_infotype type, char* data, size_t size)
+{
+ if (type == CURLINFO_TEXT) {
+ _notes += string (data, size);
+ } else if (type == CURLINFO_HEADER_IN) {
+ _notes += "<- " + string (data, size);
+ } else if (type == CURLINFO_HEADER_OUT) {
+ _notes += "-> " + string (data, size);
+ }
+ return 0;
+}
+
+
+string
+Email::encode_rfc1342(string subject)
+{
+ auto b64 = BIO_new(BIO_f_base64());
+ if (!b64) {
+ throw std::bad_alloc();
+ }
+
+ auto bio = BIO_new(BIO_s_mem());
+ if (!bio) {
+ throw std::bad_alloc();
+ }
+
+ bio = BIO_push(b64, bio);
+ BIO_write(bio, subject.c_str(), subject.length());
+ (void) BIO_flush(bio);
+
+ char* out;
+ long int bytes = BIO_get_mem_data(bio, &out);
+ string base64_subject(out, bytes);
+ BIO_free_all(b64);
+
+ boost::algorithm::replace_all(base64_subject, "\n", "");
+ return "=?utf-8?B?" + base64_subject + "?=";
+}
+
--- /dev/null
+/*
+ Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
+
+ 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.
+
+ 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 DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include <curl/curl.h>
+#include <boost/scoped_array.hpp>
+
+
+class Email
+{
+public:
+ Email(std::string from, std::vector<std::string> to, std::string subject, std::string body);
+
+ void add_cc (std::string cc);
+ void add_bcc (std::string bcc);
+ void add_attachment (boost::filesystem::path file, std::string name, std::string mime_type);
+
+ void send (std::string server, int port, EmailProtocol protocol, std::string user = "", std::string password = "");
+
+ std::string notes () const {
+ return _notes;
+ }
+
+ size_t get_data (void* ptr, size_t size, size_t nmemb);
+ int debug (CURL* curl, curl_infotype type, char* data, size_t size);
+
+ /** @return full email, after send() has been called */
+ std::string email () const {
+ return _email;
+ }
+
+ static std::string address_list(std::vector<std::string> addresses);
+
+private:
+
+ std::string fix (std::string s) const;
+ static std::string encode_rfc1342 (std::string subject);
+
+ std::string _from;
+ std::vector<std::string> _to;
+ std::string _subject;
+ std::string _body;
+ std::vector<std::string> _cc;
+ std::vector<std::string> _bcc;
+
+ struct Attachment {
+ boost::filesystem::path file;
+ std::string name;
+ std::string mime_type;
+ };
+
+ std::vector<Attachment> _attachments;
+ std::string _email;
+ size_t _offset;
+ std::string _notes;
+};
+++ /dev/null
-/*
- Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
-
- 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.
-
- 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 DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-
-#include "compose.hpp"
-#include "config.h"
-#include "emailer.h"
-#include "exceptions.h"
-#include <curl/curl.h>
-#include <boost/algorithm/string.hpp>
-#include <boost/date_time/c_local_time_adjustor.hpp>
-
-#include "i18n.h"
-
-
-using std::cout;
-using std::min;
-using std::pair;
-using std::shared_ptr;
-using std::string;
-using std::vector;
-using dcp::ArrayData;
-
-
-Emailer::Emailer(string from, vector<string> to, string subject, string body)
- : _from (from)
- , _to (to)
- , _subject (subject)
- , _body (fix (body))
- , _offset (0)
-{
-
-}
-
-
-string
-Emailer::fix (string s) const
-{
- boost::algorithm::replace_all (s, "\n", "\r\n");
- boost::algorithm::replace_all (s, "\0", " ");
- return s;
-}
-
-
-void
-Emailer::add_cc (string cc)
-{
- _cc.push_back (cc);
-}
-
-
-void
-Emailer::add_bcc (string bcc)
-{
- _bcc.push_back (bcc);
-}
-
-
-void
-Emailer::add_attachment (boost::filesystem::path file, string name, string mime_type)
-{
- Attachment a;
- a.file = file;
- a.name = name;
- a.mime_type = mime_type;
- _attachments.push_back (a);
-}
-
-
-static size_t
-curl_data_shim (void* ptr, size_t size, size_t nmemb, void* userp)
-{
- return reinterpret_cast<Emailer*>(userp)->get_data (ptr, size, nmemb);
-}
-
-
-static int
-curl_debug_shim (CURL* curl, curl_infotype type, char* data, size_t size, void* userp)
-{
- return reinterpret_cast<Emailer*>(userp)->debug (curl, type, data, size);
-}
-
-
-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, t).c_str(), t);
- _offset += t;
- return t;
-}
-
-
-void
-Emailer::send (string server, int port, EmailProtocol protocol, string user, string password)
-{
- char date_buffer[128];
- time_t now = time (0);
- strftime (date_buffer, sizeof(date_buffer), "%a, %d %b %Y %H:%M:%S ", localtime(&now));
-
- auto const utc_now = boost::posix_time::second_clock::universal_time ();
- auto const local_now = boost::date_time::c_local_adjustor<boost::posix_time::ptime>::utc_to_local (utc_now);
- auto offset = local_now - utc_now;
- sprintf (date_buffer + strlen(date_buffer), "%s%02d%02d", (offset.hours() >= 0 ? "+" : "-"), int(abs(offset.hours())), int(offset.minutes()));
-
- _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) + "\r\n";
- }
-
- if (!_bcc.empty()) {
- _email += "Bcc: " + address_list(_bcc) + "\r\n";
- }
-
- string const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
- string boundary;
- for (int i = 0; i < 32; ++i) {
- boundary += chars[rand() % chars.length()];
- }
-
- if (!_attachments.empty ()) {
- _email += "MIME-Version: 1.0\r\n"
- "Content-Type: multipart/mixed; boundary=" + boundary + "\r\n";
- }
-
- _email += "Subject: " + encode_rfc1342(_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 += _body;
-
- for (auto i: _attachments) {
- _email += "\r\n\r\n--" + boundary + "\r\n"
- "Content-Type: " + i.mime_type + "; name=" + encode_rfc1342(i.name) + "\r\n"
- "Content-Transfer-Encoding: Base64\r\n"
- "Content-Disposition: attachment; filename=" + encode_rfc1342(i.name) + "\r\n\r\n";
-
- auto b64 = BIO_new (BIO_f_base64());
- if (!b64) {
- throw std::bad_alloc();
- }
-
- auto bio = BIO_new (BIO_s_mem());
- if (!bio) {
- throw std::bad_alloc();
- }
- bio = BIO_push (b64, bio);
-
- ArrayData data (i.file);
- BIO_write (bio, data.data(), data.size());
- (void) BIO_flush (bio);
-
- char* out;
- long int bytes = BIO_get_mem_data (bio, &out);
- _email += fix (string (out, bytes));
-
- BIO_free_all (b64);
- }
-
- if (!_attachments.empty ()) {
- _email += "\r\n--" + boundary + "--\r\n";
- }
-
- curl_global_init (CURL_GLOBAL_DEFAULT);
-
- auto curl = curl_easy_init ();
- if (!curl) {
- throw NetworkError ("Could not initialise libcurl");
- }
-
- if ((protocol == EmailProtocol::AUTO && port == 465) || protocol == EmailProtocol::SSL) {
- /* "SSL" or "Implicit TLS"; I think curl wants us to use smtps here */
- curl_easy_setopt (curl, CURLOPT_URL, String::compose("smtps://%1:%2", server, port).c_str());
- } else {
- curl_easy_setopt (curl, CURLOPT_URL, String::compose("smtp://%1:%2", server, port).c_str());
- }
-
- if (!user.empty ()) {
- curl_easy_setopt (curl, CURLOPT_USERNAME, user.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 = nullptr;
- for (auto i: _to) {
- recipients = curl_slist_append (recipients, i.c_str());
- }
- for (auto i: _cc) {
- recipients = curl_slist_append (recipients, i.c_str());
- }
- for (auto i: _bcc) {
- recipients = curl_slist_append (recipients, i.c_str());
- }
-
- curl_easy_setopt (curl, CURLOPT_MAIL_RCPT, recipients);
-
- curl_easy_setopt (curl, CURLOPT_READFUNCTION, curl_data_shim);
- curl_easy_setopt (curl, CURLOPT_READDATA, this);
- curl_easy_setopt (curl, CURLOPT_UPLOAD, 1L);
-
- if (protocol == EmailProtocol::AUTO || protocol == EmailProtocol::STARTTLS) {
- curl_easy_setopt (curl, CURLOPT_USE_SSL, (long) CURLUSESSL_TRY);
- }
- curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0L);
- curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0L);
- curl_easy_setopt (curl, CURLOPT_VERBOSE, 1L);
- curl_easy_setopt (curl, CURLOPT_DEBUGFUNCTION, curl_debug_shim);
- curl_easy_setopt (curl, CURLOPT_DEBUGDATA, this);
-
- auto const r = curl_easy_perform (curl);
- if (r != CURLE_OK) {
- throw NetworkError (_("Failed to send email"), string(curl_easy_strerror(r)));
- }
-
- curl_slist_free_all (recipients);
- curl_easy_cleanup (curl);
- curl_global_cleanup ();
-}
-
-
-string
-Emailer::address_list(vector<string> addresses)
-{
- string o;
- for (auto i: addresses) {
- o += i + ", ";
- }
-
- return o.substr (0, o.length() - 2);
-}
-
-
-int
-Emailer::debug (CURL *, curl_infotype type, char* data, size_t size)
-{
- if (type == CURLINFO_TEXT) {
- _notes += string (data, size);
- } else if (type == CURLINFO_HEADER_IN) {
- _notes += "<- " + string (data, size);
- } else if (type == CURLINFO_HEADER_OUT) {
- _notes += "-> " + string (data, size);
- }
- return 0;
-}
-
-
-string
-Emailer::encode_rfc1342 (string subject)
-{
- auto b64 = BIO_new(BIO_f_base64());
- if (!b64) {
- throw std::bad_alloc();
- }
-
- auto bio = BIO_new(BIO_s_mem());
- if (!bio) {
- throw std::bad_alloc();
- }
-
- bio = BIO_push(b64, bio);
- BIO_write(bio, subject.c_str(), subject.length());
- (void) BIO_flush(bio);
-
- char* out;
- long int bytes = BIO_get_mem_data(bio, &out);
- string base64_subject(out, bytes);
- BIO_free_all(b64);
-
- boost::algorithm::replace_all(base64_subject, "\n", "");
- return "=?utf-8?B?" + base64_subject + "?=";
-}
-
+++ /dev/null
-/*
- Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
-
- 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.
-
- 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 DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-
-#include <curl/curl.h>
-#include <boost/scoped_array.hpp>
-
-
-class Emailer
-{
-public:
- Emailer(std::string from, std::vector<std::string> to, std::string subject, std::string body);
-
- void add_cc (std::string cc);
- void add_bcc (std::string bcc);
- void add_attachment (boost::filesystem::path file, std::string name, std::string mime_type);
-
- void send (std::string server, int port, EmailProtocol protocol, std::string user = "", std::string password = "");
-
- std::string notes () const {
- return _notes;
- }
-
- size_t get_data (void* ptr, size_t size, size_t nmemb);
- int debug (CURL* curl, curl_infotype type, char* data, size_t size);
-
- /** @return full email, after send() has been called */
- std::string email () const {
- return _email;
- }
-
- static std::string address_list(std::vector<std::string> addresses);
-
-private:
-
- std::string fix (std::string s) const;
- static std::string encode_rfc1342 (std::string subject);
-
- std::string _from;
- std::vector<std::string> _to;
- std::string _subject;
- std::string _body;
- std::vector<std::string> _cc;
- std::vector<std::string> _bcc;
-
- struct Attachment {
- boost::filesystem::path file;
- std::string name;
- std::string mime_type;
- };
-
- std::vector<Attachment> _attachments;
- std::string _email;
- size_t _offset;
- std::string _notes;
-};
#include "cinema.h"
#include "config.h"
#include "dkdm_wrapper.h"
-#include "emailer.h"
+#include "email.h"
#include "exceptions.h"
#include "film.h"
#include "kdm_with_metadata.h"
if (list_cinemas) {
auto cinemas = Config::instance()->cinemas ();
for (auto i: cinemas) {
- out (String::compose("%1 (%2)", i->name, Emailer::address_list (i->emails)));
+ out (String::compose("%1 (%2)", i->name, Email::address_list(i->emails)));
}
return {};
}
#include "config.h"
#include "cross.h"
#include "dcpomatic_log.h"
-#include "emailer.h"
+#include "email.h"
#include "kdm_with_metadata.h"
#include "screen.h"
#include "util.h"
continue;
}
- Emailer email (config->kdm_from(), { emails.front() }, subject, body);
+ Email email(config->kdm_from(), { emails.front() }, subject, body);
/* Use CC for the second and subsequent email addresses, so we seem less spammy (#2310) */
for (auto cc = std::next(emails.begin()); cc != emails.end(); ++cc) {
email.add_attachment (zip_file, container_name_format.get(first->name_values(), ".zip"), "application/zip");
- auto log_details = [](Emailer& email) {
+ auto log_details = [](Email& email) {
dcpomatic_log->log("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);
dcpomatic_log->log(email.email(), LogEntry::TYPE_DEBUG_EMAIL);
dcpomatic_log->log("Email session follows", LogEntry::TYPE_DEBUG_EMAIL);
#include "send_notification_email_job.h"
#include "exceptions.h"
#include "config.h"
-#include "emailer.h"
+#include "email.h"
#include "compose.hpp"
#include "i18n.h"
}
set_progress_unknown ();
- Emailer email (config->notification_from(), { config->notification_to() }, config->notification_subject(), _body);
+ Email email(config->notification_from(), { config->notification_to() }, config->notification_subject(), _body);
for (auto i: config->notification_cc()) {
email.add_cc (i);
}
#include "film.h"
#include "log.h"
#include "version.h"
-#include "emailer.h"
+#include "email.h"
#include "environment_info.h"
#include <libxml++/libxml++.h>
body += "---<8----\n";
}
- Emailer emailer (_from, {"carl@dcpomatic.com"}, "DCP-o-matic problem report", body);
- emailer.send ("main.carlh.net", 2525, EmailProtocol::STARTTLS);
+ Email email(_from, {"carl@dcpomatic.com"}, "DCP-o-matic problem report", body);
+ email.send("main.carlh.net", 2525, EmailProtocol::STARTTLS);
set_progress (1);
set_state (FINISHED_OK);
dkdm_recipient.cc
dkdm_wrapper.cc
dolby_cp750.cc
- emailer.cc
+ email.cc
empty.cc
encoder.cc
encode_server.cc
#include "lib/dcpomatic_log.h"
#include "lib/dcpomatic_socket.h"
#include "lib/dkdm_wrapper.h"
-#include "lib/emailer.h"
+#include "lib/email.h"
#include "lib/encode_server_finder.h"
#include "lib/exceptions.h"
#include "lib/ffmpeg_encoder.h"
error_dialog (this, _("You must enter a valid email address when sending translations, "
"otherwise the DCP-o-matic maintainers cannot credit you or contact you with questions."));
} else {
- Emailer emailer(dialog.email(), { "carl@dcpomatic.com" }, "DCP-o-matic translations", body);
+ Email email(dialog.email(), { "carl@dcpomatic.com" }, "DCP-o-matic translations", body);
try {
- emailer.send ("main.carlh.net", 2525, EmailProtocol::STARTTLS);
+ email.send("main.carlh.net", 2525, EmailProtocol::STARTTLS);
} catch (NetworkError& e) {
error_dialog (this, _("Could not send translations"), std_to_wx(e.what()));
}
#include "lib/config.h"
#include "lib/cross.h"
#include "lib/dcp_content_type.h"
-#include "lib/emailer.h"
+#include "lib/email.h"
#include "lib/exceptions.h"
#include "lib/filter.h"
#include "lib/log.h"
return;
}
- Emailer emailer(
+ Email email(
wx_to_std(dialog.from()),
{ wx_to_std(dialog.to()) },
wx_to_std(_("DCP-o-matic test email")),
);
auto config = Config::instance();
try {
- emailer.send(config->mail_server(), config->mail_port(), config->mail_protocol(), config->mail_user(), config->mail_password());
+ email.send(config->mail_server(), config->mail_port(), config->mail_protocol(), config->mail_user(), config->mail_password());
} catch (NetworkError& e) {
error_dialog(_panel, std_to_wx(e.summary()), std_to_wx(e.detail().get_value_or("")));
return;
projects / dcpomatic.git / commitdiff