X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcinema_kdms.cc;h=f76c96283710cc7b4bd0e3fea085a29d0d15c3bd;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hp=d95e0285425059afae27a7f344cc4170b7e6db00;hpb=8f7efc8c704891a9c5499c17fa89fe84cdf5bde4;p=dcpomatic.git

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index d95e02854..f76c96283 100644
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-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/>.
 
 */
 
@@ -124,6 +125,10 @@ CinemaKDMs::email (
 {
 	Config* config = Config::instance ();
 
+	if (config->mail_server().empty()) {
+		throw NetworkError (_("No mail server configured in preferences"));
+	}
+
 	BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
 
 		boost::filesystem::path zip_file = boost::filesystem::temp_directory_path ();
@@ -131,9 +136,9 @@ CinemaKDMs::email (
 		i.make_zip_file (film_name, zip_file);
 
 		string subject = config->kdm_subject();
-		SafeStringStream start;
+		locked_stringstream start;
 		start << from.date() << " " << from.time_of_day();
-		SafeStringStream end;
+		locked_stringstream end;
 		end << to.date() << " " << to.time_of_day();
 		boost::algorithm::replace_all (subject, "$CPL_NAME", cpl_name);
 		boost::algorithm::replace_all (subject, "$START_TIME", start.str ());
@@ -146,7 +151,7 @@ CinemaKDMs::email (
 		boost::algorithm::replace_all (body, "$END_TIME", end.str ());
 		boost::algorithm::replace_all (body, "$CINEMA_NAME", i.cinema->name);
 
-		SafeStringStream screens;
+		locked_stringstream screens;
 		BOOST_FOREACH (ScreenKDM const & j, i.screen_kdms) {
 			screens << j.screen->name << ", ";
 		}
@@ -154,8 +159,8 @@ CinemaKDMs::email (
 
 		Emailer email (config->kdm_from(), i.cinema->emails, subject, body);
 
-		if (!config->kdm_cc().empty ()) {
-			email.add_cc (config->kdm_cc ());
+		BOOST_FOREACH (string i, config->kdm_cc()) {
+			email.add_cc (i);
 		}
 		if (!config->kdm_bcc().empty ()) {
 			email.add_bcc (config->kdm_bcc ());
@@ -163,9 +168,25 @@ CinemaKDMs::email (
 
 		string const name = tidy_for_filename(i.cinema->name) + "_" + tidy_for_filename(film_name) + ".zip";
 		email.add_attachment (zip_file, name, "application/zip");
-		email.send ();
+
+		Config* c = Config::instance ();
+
+		try {
+			email.send (c->mail_server(), c->mail_port(), c->mail_user(), c->mail_password());
+		} catch (...) {
+			if (log) {
+				log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);
+				log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL);
+				log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL);
+				log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL);
+			}
+			throw;
+		}
 
 		if (log) {
+			log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);
+			log->log (email.email(), LogEntry::TYPE_DEBUG_EMAIL);
+			log->log ("Email session follows", LogEntry::TYPE_DEBUG_EMAIL);
 			log->log (email.notes(), LogEntry::TYPE_DEBUG_EMAIL);
 		}
 	}