Lines 76-82
sub create {
Link Here
|
76 |
my ( $self, $params ) = @_; |
76 |
my ( $self, $params ) = @_; |
77 |
|
77 |
|
78 |
my $args = {}; |
78 |
my $args = {}; |
79 |
$args->{from} = $params->{from} || C4::Context->preference('KohaAdminEmailAddress'); |
79 |
$args->{from} = |
|
|
80 |
$params->{sender} |
81 |
|| C4::Context->preference('ReturnpathDefault') |
82 |
|| $params->{from} |
83 |
|| C4::Context->preference('KohaAdminEmailAddress'); |
80 |
Koha::Exceptions::BadParameter->throw( |
84 |
Koha::Exceptions::BadParameter->throw( |
81 |
error => "Invalid 'from' parameter: " . $args->{from}, |
85 |
error => "Invalid 'from' parameter: " . $args->{from}, |
82 |
parameter => 'from' |
86 |
parameter => 'from' |
Lines 101-109
sub create {
Link Here
|
101 |
$addresses->{reply_to} ||= C4::Context->preference('ReplytoDefault') |
105 |
$addresses->{reply_to} ||= C4::Context->preference('ReplytoDefault') |
102 |
if C4::Context->preference('ReplytoDefault'); |
106 |
if C4::Context->preference('ReplytoDefault'); |
103 |
|
107 |
|
104 |
$addresses->{sender} = $params->{sender}; |
108 |
$addresses->{sender} = |
105 |
$addresses->{sender} ||= C4::Context->preference('ReturnpathDefault') |
109 |
$params->{from} || C4::Context->preference('KohaAdminEmailAddress'); |
106 |
if C4::Context->preference('ReturnpathDefault'); |
|
|
107 |
|
110 |
|
108 |
unless ( C4::Context->preference('SendAllEmailsTo') ) { |
111 |
unless ( C4::Context->preference('SendAllEmailsTo') ) { |
109 |
$addresses->{cc} = $params->{cc} |
112 |
$addresses->{cc} = $params->{cc} |
110 |
- |
|
|