From bd51ede66cc902719b7ba6bb771b0e385edb608a Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 12 Aug 2014 10:18:47 +1200 Subject: [PATCH] Bug 9530 Making changes to misc/cronjobs/runreport.pl Note: mail from this doesnt work in current master, so you may not be able to test this fully To Test 1/ Edit the new systempreferences (ReplytoDefault and ReturnpathDefault) 2/ Optionally edit the branch the mail will be sent from, adding email addresses 3/ Test sending a mail from scheduled reports, note you will need to have the fix for 12031 applied 4/ Check that the mails have the correct From, Replyto and ReturnPath set The rules are If the values are set in the branch use that, else use the syspref --- misc/cronjobs/runreport.pl | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/misc/cronjobs/runreport.pl b/misc/cronjobs/runreport.pl index 0725767..e568d0b 100755 --- a/misc/cronjobs/runreport.pl +++ b/misc/cronjobs/runreport.pl @@ -23,6 +23,7 @@ use warnings; use C4::Reports::Guided; # 0.12 use C4::Context; +use Koha::Email; use Getopt::Long qw(:config auto_help auto_version); use Pod::Usage; @@ -266,22 +267,25 @@ foreach my $report_id (@ARGV) { } } if ($email){ + my $message = Koha::Email->new(); my %mail; if ($format eq 'html') { $message = "$message"; - %mail = ( - To => $to, - From => $from, - 'Content-Type' => 'text/html', - Subject => encode('utf8', $subject ), - Message => encode('utf8', $message ) + %mail = $message->create_message_headers({ + to => $to, + from => $from, + contenttype => 'text/html', + subject => encode('utf8', $subject ), + messsage => encode('utf8', $message ) + } ); } else { - %mail = ( - To => $to, - From => $from, - Subject => encode('utf8', $subject ), - Message => encode('utf8', $message ) + %mail = $message->create_message_headers ({ + to => $to, + from => $from, + subject => encode('utf8', $subject ), + message => encode('utf8', $message ) + } ); } $mail{'Auth'} = {user => $username, pass => $password, method => $method} if $username; -- 2.0.1