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 Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
parent
a40dc1758f
commit
a063067b91
|
|
@ -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 $email = Koha::Email->new();
|
||||
my %mail;
|
||||
if ($format eq 'html') {
|
||||
$message = "<html><head><style>tr:nth-child(2n+1) { background-color: #ccc;}</style></head><body>$message</body></html>";
|
||||
%mail = (
|
||||
To => $to,
|
||||
From => $from,
|
||||
'Content-Type' => 'text/html',
|
||||
Subject => encode('utf8', $subject ),
|
||||
Message => encode('utf8', $message )
|
||||
%mail = $email->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 = $email->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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue