Multiple CC addresses for KDM emails (#785).

3 files changed, 14 insertions, 8 deletions

diff --git a/src/lib/cinema_kdms.cc b/src/lib/cinema_kdms.cc
index 9b106a011..9fda6e2e9 100644
--- a/src/lib/cinema_kdms.cc
+++ b/src/lib/cinema_kdms.cc
@@ -158,8 +158,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 ());
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 54d42a1b9..81acd9f62 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -92,7 +92,7 @@ Config::set_defaults ()
 	_mail_user = "";
 	_mail_password = "";
 	_kdm_from = "";
-	_kdm_cc = "";
+	_kdm_cc.clear ();
 	_kdm_bcc = "";
 	_check_for_updates = false;
 	_check_for_test_updates = false;
@@ -238,7 +238,11 @@ Config::read ()
 	_mail_password = f.optional_string_child("MailPassword").get_value_or ("");
 	_kdm_subject = f.optional_string_child ("KDMSubject").get_value_or (_("KDM delivery: $CPL_NAME"));
 	_kdm_from = f.string_child ("KDMFrom");
-	_kdm_cc = f.optional_string_child ("KDMCC").get_value_or ("");
+	BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("KDMCC")) {
+		if (!i->content().empty()) {
+			_kdm_cc.push_back (i->content ());
+		}
+	}
 	_kdm_bcc = f.optional_string_child ("KDMBCC").get_value_or ("");
 	_kdm_email = f.string_child ("KDMEmail");
 
@@ -391,7 +395,9 @@ Config::write () const
 	root->add_child("MailPassword")->add_child_text (_mail_password);
 	root->add_child("KDMSubject")->add_child_text (_kdm_subject);
 	root->add_child("KDMFrom")->add_child_text (_kdm_from);
-	root->add_child("KDMCC")->add_child_text (_kdm_cc);
+	BOOST_FOREACH (string i, _kdm_cc) {
+		root->add_child("KDMCC")->add_child_text (i);
+	}
 	root->add_child("KDMBCC")->add_child_text (_kdm_bcc);
 	root->add_child("KDMEmail")->add_child_text (_kdm_email);
 
diff --git a/src/lib/config.h b/src/lib/config.h
index 6b1f3fb87..049b3663c 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -195,7 +195,7 @@ public:
 		return _kdm_from;
 	}
 
-	std::string kdm_cc () const {
+	std::vector<std::string> kdm_cc () const {
 		return _kdm_cc;
 	}
 
@@ -386,7 +386,7 @@ public:
 		maybe_set (_kdm_from, f);
 	}
 
-	void set_kdm_cc (std::string f) {
+	void set_kdm_cc (std::vector<std::string> f) {
 		maybe_set (_kdm_cc, f);
 	}
 
@@ -523,7 +523,7 @@ private:
 	std::string _mail_password;
 	std::string _kdm_subject;
 	std::string _kdm_from;
-	std::string _kdm_cc;
+	std::vector<std::string> _kdm_cc;
 	std::string _kdm_bcc;
 	std::string _kdm_email;
 	boost::shared_ptr<const dcp::CertificateChain> _signer_chain;