From 2e6af702f547c24ab7515e136317c6e866c794a0 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 21 Mar 2022 13:45:16 -0300 Subject: [PATCH] Bug 29501: Use the default transport This patch makes the script pass the default SMTP transport to the ->send_or_die call. The default is picked as this is the current behavior. New enhancements could add the *library_id* to the message_queue table, and allow using different transports depending on that. But it is out of the scope of this bug. To test: 1. Verify messages are being sent. 2. Sign off :-D Signed-off-by: Tomas Cohen Arazi JD amended patch: revert - unless $format =~ m[^html$|^csv$|^ods$]; + unless $format =~ m/^html$|^csv$|^ods$/; Signed-off-by: Jonathan Druart Signed-off-by: Fridolin Somers --- misc/cronjobs/gather_print_notices.pl | 32 ++++++++++++++++++--------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/misc/cronjobs/gather_print_notices.pl b/misc/cronjobs/gather_print_notices.pl index 692b53b2e0..729c0d956b 100755 --- a/misc/cronjobs/gather_print_notices.pl +++ b/misc/cronjobs/gather_print_notices.pl @@ -15,6 +15,7 @@ use C4::Log qw( cronlogaction ); use Koha::DateUtils qw( dt_from_string output_pref ); use Koha::Email; use Koha::Util::OpenDocument qw( generate_ods ); +use Koha::SMTP::Servers; my ( $help, @@ -125,13 +126,19 @@ if ( @emails ) { csv => $csv_filenames, ods => $ods_filenames, }; + + my $transport = Koha::SMTP::Servers->get_default->transport; + for my $email ( @emails ) { - send_files({ - directory => $output_directory, - files => $files, - to => $email, - from => C4::Context->preference('KohaAdminEmailAddress'), # Should be replaced if bug 8000 is pushed - }); + send_files( + { + directory => $output_directory, + files => $files, + from => C4::Context->preference('KohaAdminEmailAddress'), # Should be replaced if bug 8000 is pushed + to => $email, + transport => $transport, + } + ); } } @@ -275,10 +282,12 @@ sub _generate_ods { sub send_files { my ( $params ) = @_; my $directory = $params->{directory}; - my $files = $params->{files}; - my $to = $params->{to}; - my $from = $params->{from}; - return unless $to and $from; + my $files = $params->{files}; + my $to = $params->{to}; + my $from = $params->{from}; + my $transport = $params->{transport}; + + return unless $to and $from and $transport; my $email = Koha::Email->create( { @@ -313,7 +322,8 @@ sub send_files { } } - $email->send_or_die; + $email->send_or_die( { transport => $transport } ); + } =head1 NAME -- 2.39.5