X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Femailer.h;h=4ceedb9beade87a0426dbf61e9d0deb6ea0d4eeb;hp=4b4d1f6f77d4013905d2609decbb2bd9ef430c57;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=fa8bdd16e1b3742e921b928708614613b6a21036

diff --git a/src/lib/emailer.h b/src/lib/emailer.h
index 4b4d1f6f7..4ceedb9be 100644
--- a/src/lib/emailer.h
+++ b/src/lib/emailer.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2019 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/>.
 
 */
 
@@ -23,29 +24,47 @@
 class Emailer
 {
 public:
-	Emailer (std::string from, std::string to, std::string subject, std::string body);
+	Emailer (std::string from, std::list<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 attachment, std::string);
+	void add_attachment (boost::filesystem::path file, std::string name, std::string mime_type);
 
-	void send (boost::shared_ptr<Job> job);
+	void send (std::string server, int port, EmailProtocol protocol, std::string user = "", std::string password = "");
 
-	std::string notes () const;
+	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;
+	}
 
-private:
 	static std::string address_list (std::list<std::string> addresses);
 
+private:
+
+	std::string fix (std::string s) const;
+
 	std::string _from;
-	std::string _to;
+	std::list<std::string> _to;
 	std::string _subject;
 	std::string _body;
 	std::list<std::string> _cc;
 	std::list<std::string> _bcc;
-	std::list<std::pair<boost::filesystem::path, std::string> > _attachments;
+
+	struct Attachment {
+		boost::filesystem::path file;
+		std::string name;
+		std::string mime_type;
+	};
+
+	std::list<Attachment> _attachments;
 	std::string _email;
 	size_t _offset;
-	boost::scoped_array<char> _notes_buffer;
+	std::string _notes;
 };