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 688-694
sub EnqueueLetter {
Link Here
|
688 |
my $params = shift or return; |
689 |
my $params = shift or return; |
689 |
|
690 |
|
690 |
return unless exists $params->{'letter'}; |
691 |
return unless exists $params->{'letter'}; |
691 |
# return unless exists $params->{'borrowernumber'}; |
|
|
692 |
return unless exists $params->{'message_transport_type'}; |
692 |
return unless exists $params->{'message_transport_type'}; |
693 |
|
693 |
|
694 |
my $content = $params->{letter}->{content}; |
694 |
my $content = $params->{letter}->{content}; |
Lines 708-735
sub EnqueueLetter {
Link Here
|
708 |
); |
708 |
); |
709 |
} |
709 |
} |
710 |
|
710 |
|
711 |
my $dbh = C4::Context->dbh(); |
711 |
my @to_addresses; |
712 |
my $statement = << 'ENDSQL'; |
712 |
if ( $params->{to_address} ) { |
713 |
INSERT INTO message_queue |
713 |
@to_addresses = ( $params->{to_address} ); |
714 |
( borrowernumber, subject, content, metadata, letter_code, message_transport_type, status, time_queued, to_address, from_address, content_type ) |
714 |
} elsif ( $params->{borrowernumber} and $params->{message_transport_type} eq 'email' ) { |
715 |
VALUES |
715 |
@to_addresses = @{ C4::Members::GetNoticeEmailAddresses( $params->{borrowernumber} ) }; |
716 |
( ?, ?, ?, ?, ?, ?, ?, NOW(), ?, ?, ? ) |
716 |
} |
717 |
ENDSQL |
|
|
718 |
|
717 |
|
719 |
my $sth = $dbh->prepare($statement); |
718 |
my $from_address; |
720 |
my $result = $sth->execute( |
719 |
if ( $params->{from_address} ) { |
721 |
$params->{'borrowernumber'}, # borrowernumber |
720 |
$from_address = $params->{from_address}; |
722 |
$params->{'letter'}->{'title'}, # subject |
721 |
} elsif ( $params->{message_transport_type} eq 'email' ) { |
723 |
$params->{'letter'}->{'content'}, # content |
722 |
if ( $params->{borrowernumber} ) { |
724 |
$params->{'letter'}->{'metadata'} || '', # metadata |
723 |
$from_address = C4::Branch::GetBranchEmailFromBorrowernumber( $params->{borrowernumber} ); |
725 |
$params->{'letter'}->{'code'} || '', # letter_code |
724 |
} |
726 |
$params->{'message_transport_type'}, # message_transport_type |
725 |
|
727 |
'pending', # status |
726 |
$from_address ||= C4::Context->preference('KohaAdminEmailAddress'); |
728 |
$params->{'to_address'}, # to_address |
727 |
} |
729 |
$params->{'from_address'}, # from_address |
728 |
|
730 |
$params->{'letter'}->{'content-type'}, # content_type |
729 |
my $rs = Koha::Database->new->schema->resultset('MessageQueue'); |
731 |
); |
730 |
for my $to_address ( @to_addresses ) { |
732 |
return $dbh->last_insert_id(undef,undef,'message_queue', undef); |
731 |
$rs->create({ |
|
|
732 |
borrowernumber => $params->{borrowernumber}, |
733 |
subject => $params->{letter}{title}, |
734 |
content => $params->{letter}{content}, |
735 |
metadata => ( $params->{letter}{metadata} || '' ), |
736 |
letter_code => ( $params->{letter}{code} || ''), |
737 |
message_transport_type => $params->{message_transport_type}, |
738 |
status => 'pending', |
739 |
to_address => $to_address, |
740 |
from_address => $from_address, |
741 |
content_type => $params->{letter}{'content-type'}, |
742 |
}); |
743 |
} |
744 |
return scalar( @to_addresses ); |
733 |
} |
745 |
} |
734 |
|
746 |
|
735 |
=head2 SendQueuedMessages ([$hashref]) |
747 |
=head2 SendQueuedMessages ([$hashref]) |
Lines 754-759
sub SendQueuedMessages {
Link Here
|
754 |
if $params->{'verbose'} or $debug; |
766 |
if $params->{'verbose'} or $debug; |
755 |
# This is just begging for subclassing |
767 |
# This is just begging for subclassing |
756 |
next MESSAGE if ( lc($message->{'message_transport_type'}) eq 'rss' ); |
768 |
next MESSAGE if ( lc($message->{'message_transport_type'}) eq 'rss' ); |
|
|
769 |
|
757 |
if ( lc( $message->{'message_transport_type'} ) eq 'email' ) { |
770 |
if ( lc( $message->{'message_transport_type'} ) eq 'email' ) { |
758 |
_send_message_by_email( $message, $params->{'username'}, $params->{'password'}, $params->{'method'} ); |
771 |
_send_message_by_email( $message, $params->{'username'}, $params->{'password'}, $params->{'method'} ); |
759 |
} |
772 |
} |
Lines 815-845
list of hashes, each has represents a message in the message queue.
Link Here
|
815 |
sub GetQueuedMessages { |
828 |
sub GetQueuedMessages { |
816 |
my $params = shift; |
829 |
my $params = shift; |
817 |
|
830 |
|
818 |
my $dbh = C4::Context->dbh(); |
831 |
my $rs = Koha::Database->new->schema->resultset('MessageQueue')->search( |
819 |
my $statement = << 'ENDSQL'; |
832 |
{ |
820 |
SELECT message_id, borrowernumber, subject, content, message_transport_type, status, time_queued |
833 |
( |
821 |
FROM message_queue |
834 |
$params->{borrowernumber} |
822 |
ENDSQL |
835 |
? ( borrowernumber => $params->{borrowernumber} ) |
823 |
|
836 |
: () |
824 |
my @query_params; |
837 |
), |
825 |
my @whereclauses; |
838 |
}, |
826 |
if ( exists $params->{'borrowernumber'} ) { |
839 |
{ |
827 |
push @whereclauses, ' borrowernumber = ? '; |
840 |
( |
828 |
push @query_params, $params->{'borrowernumber'}; |
841 |
$params->{limit} |
829 |
} |
842 |
? ( rows => $params->{limit} ) |
830 |
|
843 |
: () |
831 |
if ( @whereclauses ) { |
844 |
), |
832 |
$statement .= ' WHERE ' . join( 'AND', @whereclauses ); |
845 |
}, |
833 |
} |
846 |
); |
834 |
|
847 |
$rs->result_class('DBIx::Class::ResultClass::HashRefInflator'); |
835 |
if ( defined $params->{'limit'} ) { |
848 |
return [ $rs->all ]; |
836 |
$statement .= ' LIMIT ? '; |
|
|
837 |
push @query_params, $params->{'limit'}; |
838 |
} |
839 |
|
840 |
my $sth = $dbh->prepare( $statement ); |
841 |
my $result = $sth->execute( @query_params ); |
842 |
return $sth->fetchall_arrayref({}); |
843 |
} |
849 |
} |
844 |
|
850 |
|
845 |
=head2 GetMessageTransportTypes |
851 |
=head2 GetMessageTransportTypes |
Lines 945-966
sub _send_message_by_email {
Link Here
|
945 |
my ($username, $password, $method) = @_; |
951 |
my ($username, $password, $method) = @_; |
946 |
|
952 |
|
947 |
my $member = C4::Members::GetMember( 'borrowernumber' => $message->{'borrowernumber'} ); |
953 |
my $member = C4::Members::GetMember( 'borrowernumber' => $message->{'borrowernumber'} ); |
948 |
my $to_address = $message->{'to_address'}; |
954 |
|
949 |
unless ($to_address) { |
955 |
unless ( $member and $message->{to_address} ) { |
950 |
unless ($member) { |
956 |
warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})" unless $member; |
951 |
warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})"; |
957 |
_set_message_status({ |
952 |
_set_message_status( { message_id => $message->{'message_id'}, |
958 |
message_id => $message->{'message_id'}, |
953 |
status => 'failed' } ); |
959 |
status => 'failed' |
954 |
return; |
960 |
}); |
955 |
} |
961 |
return; |
956 |
$to_address = C4::Members::GetNoticeEmailAddress( $message->{'borrowernumber'} ); |
|
|
957 |
unless ($to_address) { |
958 |
# warn "FAIL: No 'to_address' and no email for " . ($member->{surname} ||'') . ", borrowernumber ($message->{borrowernumber})"; |
959 |
# warning too verbose for this more common case? |
960 |
_set_message_status( { message_id => $message->{'message_id'}, |
961 |
status => 'failed' } ); |
962 |
return; |
963 |
} |
964 |
} |
962 |
} |
965 |
|
963 |
|
966 |
my $utf8 = decode('MIME-Header', $message->{'subject'} ); |
964 |
my $utf8 = decode('MIME-Header', $message->{'subject'} ); |
Lines 970-980
sub _send_message_by_email {
Link Here
|
970 |
my $content_type = $message->{'content_type'} || 'text/plain; charset="UTF-8"'; |
968 |
my $content_type = $message->{'content_type'} || 'text/plain; charset="UTF-8"'; |
971 |
my $is_html = $content_type =~ m/html/io; |
969 |
my $is_html = $content_type =~ m/html/io; |
972 |
|
970 |
|
973 |
my $branch_email = ( $member ) ? GetBranchDetail( $member->{'branchcode'} )->{'branchemail'} : undef; |
|
|
974 |
|
971 |
|
975 |
my %sendmail_params = ( |
972 |
my %sendmail_params = ( |
976 |
To => $to_address, |
973 |
To => $message->{to_address}, |
977 |
From => $message->{'from_address'} || $branch_email || C4::Context->preference('KohaAdminEmailAddress'), |
974 |
From => $message->{from_address}, |
978 |
Subject => $subject, |
975 |
Subject => $subject, |
979 |
charset => 'utf8', |
976 |
charset => 'utf8', |
980 |
Message => $is_html ? _wrap_html($content, $subject) : $content, |
977 |
Message => $is_html ? _wrap_html($content, $subject) : $content, |
Lines 985-991
sub _send_message_by_email {
Link Here
|
985 |
$sendmail_params{ Bcc } = $bcc; |
982 |
$sendmail_params{ Bcc } = $bcc; |
986 |
} |
983 |
} |
987 |
|
984 |
|
988 |
_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 |
|
|
989 |
if ( sendmail( %sendmail_params ) ) { |
985 |
if ( sendmail( %sendmail_params ) ) { |
990 |
_set_message_status( { message_id => $message->{'message_id'}, |
986 |
_set_message_status( { message_id => $message->{'message_id'}, |
991 |
status => 'sent' } ); |
987 |
status => 'sent' } ); |
Lines 1059-1070
sub _send_message_by_sms {
Link Here
|
1059 |
return $success; |
1055 |
return $success; |
1060 |
} |
1056 |
} |
1061 |
|
1057 |
|
1062 |
sub _update_message_to_address { |
|
|
1063 |
my ($id, $to)= @_; |
1064 |
my $dbh = C4::Context->dbh(); |
1065 |
$dbh->do('UPDATE message_queue SET to_address=? WHERE message_id=?',undef,($to,$id)); |
1066 |
} |
1067 |
|
1068 |
sub _set_message_status { |
1058 |
sub _set_message_status { |
1069 |
my $params = shift or return; |
1059 |
my $params = shift or return; |
1070 |
|
1060 |
|