Lines 31-36
use C4::Log;
Link Here
|
31 |
use C4::SMS; |
31 |
use C4::SMS; |
32 |
use C4::Debug; |
32 |
use C4::Debug; |
33 |
use Koha::DateUtils; |
33 |
use Koha::DateUtils; |
|
|
34 |
use Koha::Database; |
34 |
use Date::Calc qw( Add_Delta_Days ); |
35 |
use Date::Calc qw( Add_Delta_Days ); |
35 |
use Encode; |
36 |
use Encode; |
36 |
use Carp; |
37 |
use Carp; |
Lines 907-913
sub EnqueueLetter {
Link Here
|
907 |
my $params = shift or return; |
908 |
my $params = shift or return; |
908 |
|
909 |
|
909 |
return unless exists $params->{'letter'}; |
910 |
return unless exists $params->{'letter'}; |
910 |
# return unless exists $params->{'borrowernumber'}; |
|
|
911 |
return unless exists $params->{'message_transport_type'}; |
911 |
return unless exists $params->{'message_transport_type'}; |
912 |
|
912 |
|
913 |
my $content = $params->{letter}->{content}; |
913 |
my $content = $params->{letter}->{content}; |
Lines 927-954
sub EnqueueLetter {
Link Here
|
927 |
); |
927 |
); |
928 |
} |
928 |
} |
929 |
|
929 |
|
930 |
my $dbh = C4::Context->dbh(); |
930 |
my @to_addresses; |
931 |
my $statement = << 'ENDSQL'; |
931 |
if ( $params->{to_address} ) { |
932 |
INSERT INTO message_queue |
932 |
@to_addresses = ( $params->{to_address} ); |
933 |
( borrowernumber, subject, content, metadata, letter_code, message_transport_type, status, time_queued, to_address, from_address, content_type ) |
933 |
} elsif ( $params->{borrowernumber} and $params->{message_transport_type} eq 'email' ) { |
934 |
VALUES |
934 |
@to_addresses = @{ C4::Members::GetNoticeEmailAddresses( $params->{borrowernumber} ) }; |
935 |
( ?, ?, ?, ?, ?, ?, ?, NOW(), ?, ?, ? ) |
935 |
} |
936 |
ENDSQL |
|
|
937 |
|
936 |
|
938 |
my $sth = $dbh->prepare($statement); |
937 |
my $from_address; |
939 |
my $result = $sth->execute( |
938 |
if ( $params->{from_address} ) { |
940 |
$params->{'borrowernumber'}, # borrowernumber |
939 |
$from_address = $params->{from_address}; |
941 |
$params->{'letter'}->{'title'}, # subject |
940 |
} elsif ( $params->{message_transport_type} eq 'email' ) { |
942 |
$params->{'letter'}->{'content'}, # content |
941 |
if ( $params->{borrowernumber} ) { |
943 |
$params->{'letter'}->{'metadata'} || '', # metadata |
942 |
$from_address = C4::Branch::GetBranchEmailFromBorrowernumber( $params->{borrowernumber} ); |
944 |
$params->{'letter'}->{'code'} || '', # letter_code |
943 |
} |
945 |
$params->{'message_transport_type'}, # message_transport_type |
944 |
|
946 |
'pending', # status |
945 |
$from_address ||= C4::Context->preference('KohaAdminEmailAddress'); |
947 |
$params->{'to_address'}, # to_address |
946 |
} |
948 |
$params->{'from_address'}, # from_address |
947 |
|
949 |
$params->{'letter'}->{'content-type'}, # content_type |
948 |
my $rs = Koha::Database->new->schema->resultset('MessageQueue'); |
950 |
); |
949 |
for my $to_address ( @to_addresses ) { |
951 |
return $dbh->last_insert_id(undef,undef,'message_queue', undef); |
950 |
$rs->create({ |
|
|
951 |
borrowernumber => $params->{borrowernumber}, |
952 |
subject => $params->{letter}{title}, |
953 |
content => $params->{letter}{content}, |
954 |
metadata => ( $params->{letter}{metadata} || '' ), |
955 |
letter_code => ( $params->{letter}{code} || ''), |
956 |
message_transport_type => $params->{message_transport_type}, |
957 |
status => 'pending', |
958 |
to_address => $to_address, |
959 |
from_address => $from_address, |
960 |
content_type => $params->{letter}{'content-type'}, |
961 |
}); |
962 |
} |
963 |
return scalar( @to_addresses ); |
952 |
} |
964 |
} |
953 |
|
965 |
|
954 |
=head2 SendQueuedMessages ([$hashref]) |
966 |
=head2 SendQueuedMessages ([$hashref]) |
Lines 973-978
sub SendQueuedMessages {
Link Here
|
973 |
if $params->{'verbose'} or $debug; |
985 |
if $params->{'verbose'} or $debug; |
974 |
# This is just begging for subclassing |
986 |
# This is just begging for subclassing |
975 |
next MESSAGE if ( lc($message->{'message_transport_type'}) eq 'rss' ); |
987 |
next MESSAGE if ( lc($message->{'message_transport_type'}) eq 'rss' ); |
|
|
988 |
|
976 |
if ( lc( $message->{'message_transport_type'} ) eq 'email' ) { |
989 |
if ( lc( $message->{'message_transport_type'} ) eq 'email' ) { |
977 |
_send_message_by_email( $message, $params->{'username'}, $params->{'password'}, $params->{'method'} ); |
990 |
_send_message_by_email( $message, $params->{'username'}, $params->{'password'}, $params->{'method'} ); |
978 |
} |
991 |
} |
Lines 1034-1064
list of hashes, each has represents a message in the message queue.
Link Here
|
1034 |
sub GetQueuedMessages { |
1047 |
sub GetQueuedMessages { |
1035 |
my $params = shift; |
1048 |
my $params = shift; |
1036 |
|
1049 |
|
1037 |
my $dbh = C4::Context->dbh(); |
1050 |
my $rs = Koha::Database->new->schema->resultset('MessageQueue')->search( |
1038 |
my $statement = << 'ENDSQL'; |
1051 |
{ |
1039 |
SELECT message_id, borrowernumber, subject, content, message_transport_type, status, time_queued |
1052 |
( |
1040 |
FROM message_queue |
1053 |
$params->{borrowernumber} |
1041 |
ENDSQL |
1054 |
? ( borrowernumber => $params->{borrowernumber} ) |
1042 |
|
1055 |
: () |
1043 |
my @query_params; |
1056 |
), |
1044 |
my @whereclauses; |
1057 |
}, |
1045 |
if ( exists $params->{'borrowernumber'} ) { |
1058 |
{ |
1046 |
push @whereclauses, ' borrowernumber = ? '; |
1059 |
( |
1047 |
push @query_params, $params->{'borrowernumber'}; |
1060 |
$params->{limit} |
1048 |
} |
1061 |
? ( rows => $params->{limit} ) |
1049 |
|
1062 |
: () |
1050 |
if ( @whereclauses ) { |
1063 |
), |
1051 |
$statement .= ' WHERE ' . join( 'AND', @whereclauses ); |
1064 |
}, |
1052 |
} |
1065 |
); |
1053 |
|
1066 |
$rs->result_class('DBIx::Class::ResultClass::HashRefInflator'); |
1054 |
if ( defined $params->{'limit'} ) { |
1067 |
return [ $rs->all ]; |
1055 |
$statement .= ' LIMIT ? '; |
|
|
1056 |
push @query_params, $params->{'limit'}; |
1057 |
} |
1058 |
|
1059 |
my $sth = $dbh->prepare( $statement ); |
1060 |
my $result = $sth->execute( @query_params ); |
1061 |
return $sth->fetchall_arrayref({}); |
1062 |
} |
1068 |
} |
1063 |
|
1069 |
|
1064 |
=head2 GetMessageTransportTypes |
1070 |
=head2 GetMessageTransportTypes |
Lines 1164-1185
sub _send_message_by_email {
Link Here
|
1164 |
my ($username, $password, $method) = @_; |
1170 |
my ($username, $password, $method) = @_; |
1165 |
|
1171 |
|
1166 |
my $member = C4::Members::GetMember( 'borrowernumber' => $message->{'borrowernumber'} ); |
1172 |
my $member = C4::Members::GetMember( 'borrowernumber' => $message->{'borrowernumber'} ); |
1167 |
my $to_address = $message->{'to_address'}; |
1173 |
|
1168 |
unless ($to_address) { |
1174 |
unless ( $member and $message->{to_address} ) { |
1169 |
unless ($member) { |
1175 |
warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})" unless $member; |
1170 |
warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})"; |
1176 |
_set_message_status({ |
1171 |
_set_message_status( { message_id => $message->{'message_id'}, |
1177 |
message_id => $message->{'message_id'}, |
1172 |
status => 'failed' } ); |
1178 |
status => 'failed' |
1173 |
return; |
1179 |
}); |
1174 |
} |
1180 |
return; |
1175 |
$to_address = C4::Members::GetNoticeEmailAddress( $message->{'borrowernumber'} ); |
|
|
1176 |
unless ($to_address) { |
1177 |
# warn "FAIL: No 'to_address' and no email for " . ($member->{surname} ||'') . ", borrowernumber ($message->{borrowernumber})"; |
1178 |
# warning too verbose for this more common case? |
1179 |
_set_message_status( { message_id => $message->{'message_id'}, |
1180 |
status => 'failed' } ); |
1181 |
return; |
1182 |
} |
1183 |
} |
1181 |
} |
1184 |
|
1182 |
|
1185 |
my $utf8 = decode('MIME-Header', $message->{'subject'} ); |
1183 |
my $utf8 = decode('MIME-Header', $message->{'subject'} ); |
Lines 1200-1206
sub _send_message_by_email {
Link Here
|
1200 |
my $email = Koha::Email->new(); |
1198 |
my $email = Koha::Email->new(); |
1201 |
my %sendmail_params = $email->create_message_headers( |
1199 |
my %sendmail_params = $email->create_message_headers( |
1202 |
{ |
1200 |
{ |
1203 |
to => $to_address, |
|
|
1204 |
from => $message->{'from_address'} || $branch_email, |
1201 |
from => $message->{'from_address'} || $branch_email, |
1205 |
replyto => $branch_replyto, |
1202 |
replyto => $branch_replyto, |
1206 |
sender => $branch_returnpath, |
1203 |
sender => $branch_returnpath, |
Lines 1215-1221
sub _send_message_by_email {
Link Here
|
1215 |
$sendmail_params{ Bcc } = $bcc; |
1212 |
$sendmail_params{ Bcc } = $bcc; |
1216 |
} |
1213 |
} |
1217 |
|
1214 |
|
1218 |
_update_message_to_address($message->{'message_id'},$to_address) unless $message->{to_address}; #if initial message address was empty, coming here means that a to address was found and queue should be updated |
|
|
1219 |
if ( sendmail( %sendmail_params ) ) { |
1215 |
if ( sendmail( %sendmail_params ) ) { |
1220 |
_set_message_status( { message_id => $message->{'message_id'}, |
1216 |
_set_message_status( { message_id => $message->{'message_id'}, |
1221 |
status => 'sent' } ); |
1217 |
status => 'sent' } ); |
Lines 1289-1300
sub _send_message_by_sms {
Link Here
|
1289 |
return $success; |
1285 |
return $success; |
1290 |
} |
1286 |
} |
1291 |
|
1287 |
|
1292 |
sub _update_message_to_address { |
|
|
1293 |
my ($id, $to)= @_; |
1294 |
my $dbh = C4::Context->dbh(); |
1295 |
$dbh->do('UPDATE message_queue SET to_address=? WHERE message_id=?',undef,($to,$id)); |
1296 |
} |
1297 |
|
1298 |
sub _set_message_status { |
1288 |
sub _set_message_status { |
1299 |
my $params = shift or return; |
1289 |
my $params = shift or return; |
1300 |
|
1290 |
|