Bug 30042: Remove Date::Calc dependency in batch_anonymize.pl

[srvgit] / about.pl

diff --git a/about.pl b/about.pl
index 0410feb..06f4050 100755 (executable)
--- a/about.pl
+++ b/about.pl
@@ -41,8 +41,10 @@ use C4::Installer::PerlModules;
 use Koha;
 use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Acquisition::Currencies;
+use Koha::Authorities;
 use Koha::BackgroundJob;
 use Koha::BiblioFrameworks;
+use Koha::Biblios;
 use Koha::Email;
 use Koha::Patron::Categories;
 use Koha::Patrons;
@@ -192,7 +194,7 @@ my $warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist = ( $AnonymousPatr
 
 my $warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist = ( not $anonymous_patron and Koha::Patrons->search({ privacy => 2 })->count );
 
-my $warnPrefKohaAdminEmailAddress = not Email::Valid->address(C4::Context->preference('KohaAdminEmailAddress'));
+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');
@@ -277,6 +279,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' };
@@ -319,12 +325,38 @@ if ( C4::Context->preference('ILLModule') ) {
     $template->param( warnILLConfiguration => $warnILLConfiguration );
 }
 
+{
+    # XSLT sysprefs
+    my @xslt_prefs = qw(
+        OPACXSLTDetailsDisplay
+        OPACXSLTListsDisplay
+        OPACXSLTResultsDisplay
+        XSLTDetailsDisplay
+        XSLTListsDisplay
+        XSLTResultsDisplay
+    );
+    my @warnXSLT;
+    for my $p ( @xslt_prefs ) {
+        my $xsl_filename = C4::XSLT::get_xsl_filename( $p );
+        next if -e $xsl_filename;
+        push @warnXSLT,
+          {
+            syspref  => $p,
+            value    => C4::Context->preference("$p"),
+            filename => $xsl_filename
+          };
+    }
+
+    $template->param( warnXSLT => \@warnXSLT ) if @warnXSLT;
+}
+
 if ( C4::Context->preference('SearchEngine') eq 'Elasticsearch' ) {
     # Check ES configuration health and runtime status
 
     my $es_status;
     my $es_config_error;
     my $es_running = 1;
+    my $es_has_missing = 0;
 
     my $es_conf;
     try {
@@ -349,15 +381,15 @@ if ( C4::Context->preference('SearchEngine') eq 'Elasticsearch' ) {
         my $es_status->{version} = $es->info->{version}->{number};
 
         foreach my $index ( @indexes ) {
-            my $count;
+            my $index_count;
             try {
-                $count = $es->indices->stats( index => $index )
+                $index_count = $es->indices->stats( index => $index )
                       ->{_all}{primaries}{docs}{count};
             }
             catch {
                 if ( ref($_) eq 'Search::Elasticsearch::Error::Missing' ) {
                     push @{ $es_status->{errors} }, "Index not found ($index)";
-                    $count = -1;
+                    $index_count = -1;
                 }
                 elsif ( ref($_) eq 'Search::Elasticsearch::Error::NoNodes' ) {
                     $es_running = 0;
@@ -368,15 +400,31 @@ if ( C4::Context->preference('SearchEngine') eq 'Elasticsearch' ) {
                 }
             };
 
+            my $db_count = -1;
+            my $missing_count = 0;
+            if ( $index eq $biblios_index_name ) {
+                $db_count = Koha::Biblios->search->count;
+            } elsif ( $index eq $authorities_index_name ) {
+                $db_count = Koha::Authorities->search->count;
+            }
+            if ( $db_count != -1 && $index_count != -1 ) {
+                $missing_count = $db_count - $index_count;
+                $es_has_missing = 1 if $missing_count > 0;
+            }
             push @{ $es_status->{indexes} },
               {
-                index_name => $index,
-                count      => $count
+                index_name    => $index,
+                index_count   => $index_count,
+                db_count      => $db_count,
+                missing_count => $missing_count,
               };
         }
         $es_status->{running} = $es_running;
 
-        $template->param( elasticsearch_status => $es_status );
+        $template->param(
+            elasticsearch_status      => $es_status,
+            elasticsearch_has_missing => $es_has_missing,
+        );
     }
 }