name_values['s'] = i.screen->name;
name_values['i'] = i.kdm.id ();
- string const name = name_format.get(name_values, ".xml");
+ string const name = careful_string_filter(name_format.get(name_values, ".xml"));
if (zip_add (zip, name.c_str(), source) == -1) {
throw runtime_error ("failed to add KDM to ZIP archive");
}
}
if (zip_close (zip) == -1) {
- throw runtime_error ("failed to close ZIP archive");
+ int zep;
+ int sep;
+ zip_error_get (zip, &zep, &sep);
+ throw runtime_error (String::compose("failed to close ZIP archive (%1, %2)", zep, sep));
}
}
BOOST_FOREACH (CinemaKDMs const & i, cinema_kdms) {
+ if (i.cinema->emails.empty()) {
+ continue;
+ }
+
name_values['c'] = i.cinema->name;
boost::filesystem::path zip_file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
Config* c = Config::instance ();
try {
- email.send (c->mail_server(), c->mail_port(), c->mail_user(), c->mail_password());
+ email.send (c->mail_server(), c->mail_port(), c->mail_protocol(), c->mail_user(), c->mail_password());
} catch (...) {
boost::filesystem::remove (zip_file);
dcpomatic_log->log ("Email content follows", LogEntry::TYPE_DEBUG_EMAIL);