Lines 897-905
sub _send_message_by_email ($;$$$) {
Link Here
|
897 |
my $message = shift or return; |
897 |
my $message = shift or return; |
898 |
my ($username, $password, $method) = @_; |
898 |
my ($username, $password, $method) = @_; |
899 |
|
899 |
|
900 |
my $to_address = $message->{to_address}; |
900 |
my $member = C4::Members::GetMember( 'borrowernumber' => $message->{'borrowernumber'} ); |
|
|
901 |
my $branch = GetBranchDetail( $member->{'branchcode'} ); |
902 |
my $to_address = $message->{'to_address'}; |
901 |
unless ($to_address) { |
903 |
unless ($to_address) { |
902 |
my $member = C4::Members::GetMember( 'borrowernumber' => $message->{'borrowernumber'} ); |
|
|
903 |
unless ($member) { |
904 |
unless ($member) { |
904 |
warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})"; |
905 |
warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})"; |
905 |
_set_message_status( { message_id => $message->{'message_id'}, |
906 |
_set_message_status( { message_id => $message->{'message_id'}, |
Lines 930-936
sub _send_message_by_email ($;$$$) {
Link Here
|
930 |
my $is_html = $content_type =~ m/html/io; |
931 |
my $is_html = $content_type =~ m/html/io; |
931 |
my %sendmail_params = ( |
932 |
my %sendmail_params = ( |
932 |
To => $to_address, |
933 |
To => $to_address, |
933 |
From => $message->{'from_address'} || C4::Context->preference('KohaAdminEmailAddress'), |
934 |
From => $message->{'from_address'} || $branch->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress'), |
934 |
Subject => $subject, |
935 |
Subject => $subject, |
935 |
charset => 'utf8', |
936 |
charset => 'utf8', |
936 |
Message => $is_html ? _wrap_html($content, $subject) : $content, |
937 |
Message => $is_html ? _wrap_html($content, $subject) : $content, |
937 |
- |
|
|