Browse Source

Bug 28017: Allow non-FQDN (@localhost) addresses

This patch makes Koha::Email support using @localhost addresses.

To test:
1. Apply the regression tests
2. Run:
   $ kshell
  k$ prove t/Koha/Email.t
=> FAIL: Koha::Email doesn't support non-fqdn addresses
3. Apply this patch
4. Repeat 2
=> SUCCESS: All tests pass!
5. Sign off :-D

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
21.05.x
Tomás Cohen Arazi 2 years ago
committed by Jonathan Druart
parent
commit
4413557b00
  1. 14
      Koha/Email.pm

14
Koha/Email.pm

@ -78,7 +78,7 @@ sub create {
my $args = {};
$args->{from} = $params->{from} || C4::Context->preference('KohaAdminEmailAddress');
Koha::Exceptions::BadParameter->throw("Invalid 'from' parameter: ".$args->{from})
unless Email::Valid->address($args->{from}); # from is mandatory
unless Email::Valid->address( -address => $args->{from}, -fqdn => 0 ); # from is mandatory
$args->{subject} = $params->{subject} // '';
@ -90,7 +90,7 @@ sub create {
}
Koha::Exceptions::BadParameter->throw("Invalid 'to' parameter: ".$args->{to})
unless Email::Valid->address($args->{to}); # to is mandatory
unless Email::Valid->address( -address => $args->{to}, -fqdn => 0 ); # to is mandatory
my $addresses = {};
$addresses->{reply_to} = $params->{reply_to};
@ -108,9 +108,13 @@ sub create {
if exists $params->{bcc};
}
foreach my $address ( keys %{ $addresses } ) {
Koha::Exceptions::BadParameter->throw("Invalid '$address' parameter: ".$addresses->{$address})
if $addresses->{$address} and !Email::Valid->address($addresses->{$address});
foreach my $address ( keys %{$addresses} ) {
Koha::Exceptions::BadParameter->throw(
"Invalid '$address' parameter: " . $addresses->{$address} )
if $addresses->{$address} and !Email::Valid->address(
-address => $addresses->{$address},
-fqdn => 0
);
}
$args->{cc} = $addresses->{cc}

Loading…
Cancel
Save