Lines 980-985
sub SendQueuedMessages {
Link Here
|
980 |
my $limit = $params->{limit}; |
980 |
my $limit = $params->{limit}; |
981 |
my $where = $params->{where}; |
981 |
my $where = $params->{where}; |
982 |
|
982 |
|
|
|
983 |
my $smtp_transports = {}; |
984 |
|
983 |
my $count_messages = 0; |
985 |
my $count_messages = 0; |
984 |
my $unsent_messages = Koha::Notice::Messages->search({ |
986 |
my $unsent_messages = Koha::Notice::Messages->search({ |
985 |
status => 'pending', |
987 |
status => 'pending', |
Lines 1009-1015
sub SendQueuedMessages {
Link Here
|
1009 |
# This is just begging for subclassing |
1011 |
# This is just begging for subclassing |
1010 |
next if ( lc($message->{'message_transport_type'}) eq 'rss' ); |
1012 |
next if ( lc($message->{'message_transport_type'}) eq 'rss' ); |
1011 |
if ( lc( $message->{'message_transport_type'} ) eq 'email' ) { |
1013 |
if ( lc( $message->{'message_transport_type'} ) eq 'email' ) { |
1012 |
my $rv = _send_message_by_email( $message, $params->{'username'}, $params->{'password'}, $params->{'method'} ); |
1014 |
my $rv = _send_message_by_email( $message, $params->{'username'}, $params->{'password'}, $params->{'method'}, $smtp_transports ); |
1013 |
$count_messages++ if $rv; |
1015 |
$count_messages++ if $rv; |
1014 |
} |
1016 |
} |
1015 |
elsif ( lc( $message->{'message_transport_type'} ) eq 'sms' ) { |
1017 |
elsif ( lc( $message->{'message_transport_type'} ) eq 'sms' ) { |
Lines 1315-1321
sub _get_unsent_messages {
Link Here
|
1315 |
|
1317 |
|
1316 |
sub _send_message_by_email { |
1318 |
sub _send_message_by_email { |
1317 |
my $message = shift or return; |
1319 |
my $message = shift or return; |
1318 |
my ($username, $password, $method) = @_; |
1320 |
my ( $username, $password, $method, $smtp_transports ) = @_; |
1319 |
|
1321 |
|
1320 |
my $patron; |
1322 |
my $patron; |
1321 |
my $to_address = $message->{'to_address'}; |
1323 |
my $to_address = $message->{'to_address'}; |
Lines 1467-1474
sub _send_message_by_email {
Link Here
|
1467 |
if !$message->{to_address} |
1469 |
if !$message->{to_address} |
1468 |
|| $message->{to_address} ne $email->email->header('To'); |
1470 |
|| $message->{to_address} ne $email->email->header('To'); |
1469 |
|
1471 |
|
|
|
1472 |
$smtp_transports->{ $smtp_server->id } ||= $smtp_server->transport; |
1473 |
my $smtp_transport = $smtp_transports->{ $smtp_server->id }; |
1474 |
|
1470 |
try { |
1475 |
try { |
1471 |
$email->send_or_die({ transport => $smtp_server->transport }); |
1476 |
$email->send_or_die({ transport => $smtp_transport }); |
1472 |
|
1477 |
|
1473 |
_set_message_status( |
1478 |
_set_message_status( |
1474 |
{ |
1479 |
{ |