X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=about.pl;h=f4d1c7a9598074eba362d9a0d3a0377a12215c01;hb=170ad86255fec01a9f4628f2eb6623f8d6d3b386;hp=de53ac02f5629ccb4f0940712a137bf9533b6009;hpb=ebece43a9601754e0a055187cce0efe538333db8;p=srvgit diff --git a/about.pl b/about.pl index de53ac02f5..f4d1c7a959 100755 --- a/about.pl +++ b/about.pl @@ -24,28 +24,27 @@ use Modern::Perl; use CGI qw ( -utf8 ); use DateTime::TimeZone; -use File::Spec; -use File::Slurp; -use List::MoreUtils qw/ any /; -use LWP::Simple; -use Module::Load::Conditional qw(can_load); -use XML::Simple; -use Config; +use File::Slurp qw( read_file ); +use List::MoreUtils qw( any ); +use Module::Load::Conditional qw( can_load ); +use Config qw( %Config ); use Search::Elasticsearch; -use Try::Tiny; +use Try::Tiny qw( catch try ); use YAML::XS; use Encode; -use C4::Output; -use C4::Auth; +use C4::Output qw( output_html_with_http_headers ); +use C4::Auth qw( get_template_and_user get_user_subpermissions ); use C4::Context; use C4::Installer::PerlModules; use Koha; -use Koha::DateUtils qw(dt_from_string output_pref); +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; @@ -58,9 +57,6 @@ use Koha::Filter::MARC::ViewPolicy; use C4::Members::Statistics; - -#use Smart::Comments '####'; - my $query = CGI->new; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { @@ -68,7 +64,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( query => $query, type => "intranet", flagsrequired => { catalogue => 1 }, - debug => 1, } ); @@ -130,7 +125,7 @@ if ($^O ne 'VMS') { my $zebraVersion = `zebraidx -V`; # Check running PSGI env -if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) { +if ( C4::Context->psgi_env ) { $template->param( is_psgi => 1, psgi_server => ($ENV{ PLACK_ENV }) ? "Plack ($ENV{PLACK_ENV})" : @@ -177,8 +172,8 @@ if ($prefStatisticsFields) { } my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities'); -my $prefBiblioAddsAuthorities = C4::Context->preference('BiblioAddsAuthorities'); -my $warnPrefBiblioAddsAuthorities = ( $prefAutoCreateAuthorities && ( !$prefBiblioAddsAuthorities) ); +my $prefRequireChoosingExistingAuthority = C4::Context->preference('RequireChoosingExistingAuthority'); +my $warnPrefRequireChoosingExistingAuthority = ( !$prefAutoCreateAuthorities && ( !$prefRequireChoosingExistingAuthority) ); my $prefEasyAnalyticalRecords = C4::Context->preference('EasyAnalyticalRecords'); my $prefUseControlNumber = C4::Context->preference('UseControlNumber'); @@ -199,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'); @@ -284,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' }; @@ -326,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 { @@ -356,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; @@ -375,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, + ); } } @@ -499,6 +540,8 @@ $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs; SELECT COUNT(*) FROM ( SELECT relationship FROM borrower_relationships WHERE relationship='_bad_data' + UNION ALL + SELECT relationship FROM borrowers WHERE relationship='_bad_data') a }); $bad_relationships_count = $bad_relationships_count->[0]->[0]; @@ -507,6 +550,8 @@ $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs; SELECT DISTINCT(relationship) FROM ( SELECT relationship FROM borrower_relationships WHERE relationship IS NOT NULL + UNION ALL + SELECT relationship FROM borrowers WHERE relationship IS NOT NULL) a }); my %valid_relationships = map { $_ => 1 } split( /,|\|/, C4::Context->preference('borrowerRelationship') ); @@ -587,9 +632,9 @@ $template->param( mysqlVersion => $versions{'mysqlVersion'}, apacheVersion => $versions{'apacheVersion'}, zebraVersion => $zebraVersion, - prefBiblioAddsAuthorities => $prefBiblioAddsAuthorities, + prefRequireChoosingExistingAuthority => $prefRequireChoosingExistingAuthority, prefAutoCreateAuthorities => $prefAutoCreateAuthorities, - warnPrefBiblioAddsAuthorities => $warnPrefBiblioAddsAuthorities, + warnPrefRequireChoosingExistingAuthority => $warnPrefRequireChoosingExistingAuthority, warnPrefEasyAnalyticalRecords => $warnPrefEasyAnalyticalRecords, warnPrefAnonymousPatronOPACPrivacy => $warnPrefAnonymousPatronOPACPrivacy, warnPrefAnonymousPatronAnonSuggestions => $warnPrefAnonymousPatronAnonSuggestions, @@ -677,6 +722,7 @@ my $dev_team = (sort {$b <=> $a} (keys %{$teams->{team}}))[0]; my $short_version = substr($versions{'kohaVersion'},0,5); my $minor = substr($versions{'kohaVersion'},3,2); my $development_version = ( $minor eq '05' || $minor eq '11' ) ? 0 : 1; +my $codename; $template->param( short_version => $short_version ); $template->param( development_version => $development_version ); @@ -702,7 +748,16 @@ for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) { } } } - elsif ( $role ne 'release_date' ) { + elsif ( $role eq 'release_date' ) { + $teams->{team}->{$version}->{$role} = DateTime->from_epoch( epoch => $teams->{team}->{$version}->{$role}); + } + elsif ( $role eq 'codename' ) { + if ( $version == $short_version ) { + $codename = $teams->{team}->{$version}->{$role}; + } + next; + } + else { my $name = $teams->{team}->{$version}->{$role}->{name}; # Add role to contributors push @{ $contributors->{$name}->{roles}->{$normalized_role} }, @@ -713,9 +768,6 @@ for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) { $contributors->{$name}->{openhub}; } } - else { - $teams->{team}->{$version}->{$role} = DateTime->from_epoch( epoch => $teams->{team}->{$version}->{$role}); - } } } @@ -733,6 +785,7 @@ my @people = map { lc($a2last||"") cmp lc($b2last||""); } keys %$contributors; +$template->param( kohaCodename => $codename); $template->param( contributors => \@people ); $template->param( maintenance_team => $teams->{team}->{$dev_team} ); $template->param( release_team => $teams->{team}->{$short_version} );