X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Femailer.cc;h=5e645457d32f8ed7b99ca4126ba14fb55767960d;hp=4081c61153cded88fc3f8d505f84443dd0e49d1e;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=5c1402d81d552a3f8649cfdca6726a3023726f80

diff --git a/src/lib/emailer.cc b/src/lib/emailer.cc
index 4081c6115..5e645457d 100644
--- a/src/lib/emailer.cc
+++ b/src/lib/emailer.cc
@@ -1,24 +1,24 @@
 /*
     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 "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<string> to, string subject, string body)
 	: _from (from)
@@ -44,6 +45,7 @@ Emailer::Emailer (string from, list<string> to, string subject, string body)
 	, _offset (0)
 {
 	boost::algorithm::replace_all (_body, "\n", "\r\n");
+	boost::algorithm::replace_all (_body, "\0", " ");
 }
 
 void
@@ -90,7 +92,7 @@ Emailer::get_data (void* ptr, size_t size, size_t nmemb)
 }
 
 void
-Emailer::send ()
+Emailer::send (string server, int port, string user, string password)
 {
 	char date_buffer[32];
 	time_t now = time (0);
@@ -108,11 +110,11 @@ Emailer::send ()
 	      << "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";
@@ -172,17 +174,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 +211,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);