Bug 30769: Typo fix in request.tt

[koha-ffzg.git] / about.pl

diff --git a/about.pl b/about.pl
index b95578b..ba34341 100755 (executable)
--- a/about.pl
+++ b/about.pl
@@ -24,7 +24,6 @@ use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use DateTime::TimeZone;
-use Email::Address;
 use File::Slurp qw( read_file );
 use List::MoreUtils qw( any );
 use Module::Load::Conditional qw( can_load );
@@ -193,7 +192,7 @@ my $warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist = ( $AnonymousPatr
 
 my $warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist = ( not $anonymous_patron and Koha::Patrons->search({ privacy => 2 })->count );
 
-my $warnPrefKohaAdminEmailAddress = C4::Context->preference('KohaAdminEmailAddress') !~ m/$Email::Address::mailbox/;
+my $warnPrefKohaAdminEmailAddress = !Koha::Email->is_valid(C4::Context->preference('KohaAdminEmailAddress'));
 
 my $c = Koha::Items->filter_by_visible_in_opac->count;
 my @warnings = C4::Context->dbh->selectrow_array('SHOW WARNINGS');
@@ -278,6 +277,10 @@ if ( ! C4::Context->config('tmp_path') ) {
     }
 }
 
+if( ! C4::Context->config('encryption_key') ) {
+    push @xml_config_warnings, { error => 'encryption_key_missing' };
+}
+
 # Test Zebra facets configuration
 if ( !defined C4::Context->config('use_zebra_facets') ) {
     push @xml_config_warnings, { error => 'use_zebra_facets_entry_missing' };