Add configuration of KDM SMTP port; remove slight warning about plaintext passwords.

3 files changed, 21 insertions, 5 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index ee38e9866..657d79b71 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -75,6 +75,7 @@ Config::set_defaults ()
 	_default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR");
 	_default_j2k_bandwidth = 100000000;
 	_default_audio_delay = 0;
+	_mail_port = 25;
 	_check_for_updates = false;
 	_check_for_test_updates = false;
 	_maximum_j2k_bandwidth = 250000000;
@@ -192,6 +193,7 @@ Config::read ()
 	}
 
 	_mail_server = f.string_child ("MailServer");
+	_mail_port = f.optional_number_child<int> ("MailPort").get_value_or (25);
 	_mail_user = f.optional_string_child("MailUser").get_value_or ("");
 	_mail_password = f.optional_string_child("MailPassword").get_value_or ("");
 	_kdm_subject = f.optional_string_child ("KDMSubject").get_value_or (_("KDM delivery: $CPL_NAME"));
@@ -342,6 +344,7 @@ Config::write () const
 	}
 
 	root->add_child("MailServer")->add_child_text (_mail_server);
+	root->add_child("MailPort")->add_child_text (raw_convert<string> (_mail_port));
 	root->add_child("MailUser")->add_child_text (_mail_user);
 	root->add_child("MailPassword")->add_child_text (_mail_password);
 	root->add_child("KDMSubject")->add_child_text (_kdm_subject);
diff --git a/src/lib/config.h b/src/lib/config.h
index 0040591f1..a5fdc17c0 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -157,6 +157,10 @@ public:
 		return _mail_server;
 	}
 
+	int mail_port () const {
+		return _mail_port;
+	}
+
 	std::string mail_user () const {
 		return _mail_user;
 	}
@@ -324,6 +328,10 @@ public:
 		maybe_set (_mail_server, s);
 	}
 
+	void set_mail_port (int p) {
+		maybe_set (_mail_port, p);
+	}
+
 	void set_mail_user (std::string u) {
 		maybe_set (_mail_user, u);
 	}
@@ -458,6 +466,7 @@ private:
 	int _default_audio_delay;
 	std::list<boost::shared_ptr<Cinema> > _cinemas;
 	std::string _mail_server;
+	int _mail_port;
 	std::string _mail_user;
 	std::string _mail_password;
 	std::string _kdm_subject;
diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index 8489eed33..f9b21c525 100644
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -271,19 +271,23 @@ email_kdms (
 		quickmail_set_body (mail, body.c_str());
 		quickmail_add_attachment_file (mail, zip_file.string().c_str(), "application/zip");
 
-		int const port = Config::instance()->mail_user().empty() ? 25 : 587;
-
 		char const* error = quickmail_send (
 			mail,
 			Config::instance()->mail_server().c_str(),
-			port,
+			Config::instance()->mail_port(),
 			Config::instance()->mail_user().c_str(),
 			Config::instance()->mail_password().c_str()
 			);
 
 		if (error) {
 			quickmail_destroy (mail);
-			throw KDMError (String::compose ("Failed to send KDM email (%1)", error));
+			throw KDMError (
+				String::compose (
+					"Failed to send KDM email to %1 (%2)",
+					Config::instance()->mail_server(),
+					error
+					)
+				);
 		}
 		quickmail_destroy (mail);
 	}