From 9e1e9a27c28acf555a88bbecea38125bd293876e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 19 Mar 2014 10:37:57 +0100 Subject: [PATCH] Bug 8000: Replace Data::Validate::Email with Email::Valid --- C4/Installer/PerlDependencies.pm | 4 ++-- C4/Letters.pm | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm index 7fcbd1c..734cf16 100644 --- a/C4/Installer/PerlDependencies.pm +++ b/C4/Installer/PerlDependencies.pm @@ -699,10 +699,10 @@ our $PERL_DEPS = { 'required' => '0', 'min_ver' => '0.73', }, - 'Data::Validate::Email' => { + 'Email::Valid' => { 'usage' => 'Email validation', 'required' => '1', - 'min_ver' => '0.04', + 'min_ver' => '0.190', }, }; diff --git a/C4/Letters.pm b/C4/Letters.pm index 5780960..d3c60bd 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -34,7 +34,7 @@ use Koha::DateUtils; use Date::Calc qw( Add_Delta_Days ); use Encode; use Carp; -use Data::Validate::Email qw(is_email); +use Email::Valid; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); @@ -288,7 +288,7 @@ sub SendAlerts { my $borinfo = C4::Members::GetMember('borrowernumber' => $_->{'borrowernumber'}); my $sendAllEmailsTo = C4::Context->preference('SendAllEmailsTo'); my $email = $sendAllEmailsTo; - if (!($sendAllEmailsTo && is_email($sendAllEmailsTo))){ + if (!($sendAllEmailsTo && Email::Valid->address($sendAllEmailsTo))){ $email = $borinfo->{email} or next; } @@ -376,7 +376,7 @@ sub SendAlerts { my $allemails = join( ',', @email); my $sendAllEmailsTo = C4::Context->preference('SendAllEmailsTo'); - $allemails = $sendAllEmailsTo if ($sendAllEmailsTo && is_email($sendAllEmailsTo) ); + $allemails = $sendAllEmailsTo if ($sendAllEmailsTo && Email::Valid->address($sendAllEmailsTo) ); # ... then send mail my %mail = ( To => $allemails, @@ -417,7 +417,7 @@ sub SendAlerts { return { error => "no_email" } unless $externalid->{'emailaddr'}; my $emailaddr = $externalid->{'emailaddr'}; my $sendAllEmailsTo = C4::Context->preference('SendAllEmailsTo'); - $emailaddr = $sendAllEmailsTo if ($sendAllEmailsTo && is_email($sendAllEmailsTo) ); + $emailaddr = $sendAllEmailsTo if ($sendAllEmailsTo && Email::Valid->address($sendAllEmailsTo) ); # ... then send mail my %mail = ( To => $emailaddr, @@ -944,7 +944,7 @@ sub _send_message_by_email { $to_address = C4::Members::GetNoticeEmailAddress( $message->{'borrowernumber'} ); } my $sendAllEmailsTo = C4::Context->preference('SendAllEmailsTo'); - $to_address = $sendAllEmailsTo if ($sendAllEmailsTo && is_email($sendAllEmailsTo) ); + $to_address = $sendAllEmailsTo if ($sendAllEmailsTo && Email::Valid->address($sendAllEmailsTo) ); unless ($to_address) { if (!$member) { warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})"; -- 1.7.10.4