|
Lines 910-918
sub _send_message_by_email {
Link Here
|
| 910 |
my $message = shift or return; |
910 |
my $message = shift or return; |
| 911 |
my ($username, $password, $method) = @_; |
911 |
my ($username, $password, $method) = @_; |
| 912 |
|
912 |
|
| 913 |
my $to_address = $message->{to_address}; |
913 |
my $member = C4::Members::GetMember( 'borrowernumber' => $message->{'borrowernumber'} ); |
|
|
914 |
my $to_address = $message->{'to_address'}; |
| 914 |
unless ($to_address) { |
915 |
unless ($to_address) { |
| 915 |
my $member = C4::Members::GetMember( 'borrowernumber' => $message->{'borrowernumber'} ); |
|
|
| 916 |
unless ($member) { |
916 |
unless ($member) { |
| 917 |
warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})"; |
917 |
warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})"; |
| 918 |
_set_message_status( { message_id => $message->{'message_id'}, |
918 |
_set_message_status( { message_id => $message->{'message_id'}, |
|
Lines 943-949
sub _send_message_by_email {
Link Here
|
| 943 |
my $is_html = $content_type =~ m/html/io; |
943 |
my $is_html = $content_type =~ m/html/io; |
| 944 |
my %sendmail_params = ( |
944 |
my %sendmail_params = ( |
| 945 |
To => $to_address, |
945 |
To => $to_address, |
| 946 |
From => $message->{'from_address'} || C4::Context->preference('KohaAdminEmailAddress'), |
946 |
From => $message->{'from_address'} || GetBranchDetail( $member->{'branchcode'} )->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress'), |
| 947 |
Subject => $subject, |
947 |
Subject => $subject, |
| 948 |
charset => 'utf8', |
948 |
charset => 'utf8', |
| 949 |
Message => $is_html ? _wrap_html($content, $subject) : $content, |
949 |
Message => $is_html ? _wrap_html($content, $subject) : $content, |
| 950 |
- |
|
|