Attachment 131446 Details for Bug 29501 – Bug 29501: Make gather_print_notices.pl use Koha::Email

[patch] Bug 29501: Make gather_print_notices.pl use Koha::Email

Bug-29501-Make-gatherprintnoticespl-use-KohaEmail.patch (text/plain), 2.54 KB, created by Martin Renvoize (ashimema) on 2022-03-08 11:44:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-03-08 11:44:09 UTC

Size: 2.54 KB

patch

obsolete

>From 57301667d29bc0c553cebc80cb2d2b9a5f8e9a66 Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@theke.io>
>Date: Thu, 18 Nov 2021 09:40:22 -0300
>Subject: [PATCH] Bug 29501: Make gather_print_notices.pl use Koha::Email
>
>This patch makes the cronjob script use Koha::Email and thus relying on
>configured SMTP settings instead of just trying localhost.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> misc/cronjobs/gather_print_notices.pl | 29 ++++++++++++++-------------
> 1 file changed, 15 insertions(+), 14 deletions(-)
>
>diff --git a/misc/cronjobs/gather_print_notices.pl b/misc/cronjobs/gather_print_notices.pl
>index 488ce0791e..8d449d15f8 100755
>--- a/misc/cronjobs/gather_print_notices.pl
>+++ b/misc/cronjobs/gather_print_notices.pl
>@@ -13,8 +13,8 @@ use Getopt::Long qw( GetOptions );
> 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 MIME::Lite;
> 
> my (
>     $help,
>@@ -144,7 +144,7 @@ sub print_notices {
>     my $format = $params->{format} // 'html';
> 
>     die "Format $format is not known"
>-        unless $format =~ m[^html$|^csv$|^ods$];
>+        unless $format =~ m/^html$|^csv$|^ods$/;
> 
>     my ( @filenames, $messages_by_branch );
> 
>@@ -280,11 +280,12 @@ sub send_files {
>     my $from = $params->{from};
>     return unless $to and $from;
> 
>-    my $mail = MIME::Lite->new(
>-        From     => $from,
>-        To       => $to,
>-        Subject  => 'Print notices for ' . $today_syspref,
>-        Type     => 'multipart/mixed',
>+    my $email = Koha::Email->create(
>+        {
>+            from    => $from,
>+            to      => $to,
>+            subject => 'Print notices for ' . $today_syspref,
>+        }
>     );
> 
>     while ( my ( $type, $filenames ) = each %$files ) {
>@@ -299,20 +300,20 @@ sub send_files {
> 
>             next unless $mimetype;
> 
>-            my $filepath = File::Spec->catdir( $directory, $filename );
>+            my $filepath = File::Spec->catfile( $directory, $filename );
> 
>             next unless $filepath or -f $filepath;
> 
>-            $mail->attach(
>-              Type     => $mimetype,
>-              Path     => $filepath,
>-              Filename => $filename,
>-              Encoding => 'base64',
>+            $email->attach_file(
>+                $filepath,
>+                content_type => $mimetype,
>+                name         => $filename,
>+                disposition  => 'attachment',
>             );
>         }
>     }
> 
>-    $mail->send;
>+    $email->send_or_die;
> }
> 
> =head1 NAME
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 29501: 127789 | 127790 | 127794 | 131446 | 131447 | 131448 | 131989 | 131990 | 131991 | 131992 | 132003 | 132004 | 132005 | 132006