X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=about.pl;h=e92015fbc7fea3272fc59742007951bfbff487bb;hb=76bf4a898e38a76596ee198d893a8fbfa79a0bfb;hp=a8df6aa31290474f1235211b95abc95c69c62889;hpb=fafcbff015fe8e7abe31cf8a0668b17d1bc729bb;p=koha-ffzg.git diff --git a/about.pl b/about.pl index a8df6aa312..e92015fbc7 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,19 @@ 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'); +my $warnPrefOpacHiddenItems = $warnings[2]; + +my $invalid_yesno = Koha::Config::SysPrefs->search( + { + type => 'YesNo', + value => { -or => { 'is' => undef, -not_in => [ "1", "0" ] } } + } +); +$template->param( invalid_yesno => $invalid_yesno ); my $errZebraConnection = C4::Context->Zconn("biblioserver",0)->errcode(); @@ -209,8 +216,6 @@ my $warnNoActiveCurrency = (! defined Koha::Acquisition::Currencies->get_active) my @xml_config_warnings; -my $context = C4::Context->new; - if ( C4::Context->config('zebra_bib_index_mode') and C4::Context->config('zebra_bib_index_mode') eq 'grs1' ) { @@ -223,9 +228,10 @@ if ( C4::Context->config('zebra_auth_index_mode') push @xml_config_warnings, { error => 'zebra_auth_index_mode_is_grs1' }; } +my $authorityserver = C4::Context->zebraconfig('authorityserver'); if( ( C4::Context->config('zebra_auth_index_mode') and C4::Context->config('zebra_auth_index_mode') eq 'dom' ) - && ( $context->{'server'}->{'authorityserver'}->{'config'} !~ /zebra-authorities-dom.cfg/ ) ) + && ( $authorityserver->{config} !~ /zebra-authorities-dom.cfg/ ) ) { push @xml_config_warnings, { error => 'zebra_auth_index_mode_mismatch_warn' @@ -273,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' }; @@ -315,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 { @@ -345,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; @@ -364,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, + ); } } @@ -409,10 +461,6 @@ if ( C4::Context->preference('WebBasedSelfCheck') ); } -if ( C4::Context->preference('EnablePayPalOpacPayments') ) { - $template->param( paypal_enabled => 1 ); -} - # Test YAML system preferences # FIXME: This is list of current YAML formatted prefs, should by type of preference my @yaml_prefs = ( @@ -584,15 +632,16 @@ $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, warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist => $warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist, warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist => $warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist, warnPrefKohaAdminEmailAddress => $warnPrefKohaAdminEmailAddress, + warnPrefOpacHiddenItems => $warnPrefOpacHiddenItems, errZebraConnection => $errZebraConnection, warnIsRootUser => $warnIsRootUser, warnNoActiveCurrency => $warnNoActiveCurrency, @@ -681,6 +730,7 @@ my $contributors = -e "$docdir" . "/contributors.yaml" ? YAML::XS::LoadFile( "$docdir" . "/contributors.yaml" ) : {}; +delete $contributors->{_others_}; for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) { for my $role ( keys %{ $teams->{team}->{$version} } ) { my $normalized_role = "$role"; @@ -718,10 +768,15 @@ for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) { my @people = map { { name => $_, ( $contributors->{$_} ? %{ $contributors->{$_} } : () ) } } sort { - my ($alast) = ( split( /\s/, $a ) )[-1]; - my ($blast) = ( split( /\s/, $b ) )[-1]; - lc($alast) cmp lc($blast) -} keys %{$contributors}; + my ($alast) = $a =~ /(\S+)$/; + my ($blast) = $b =~ /(\S+)$/; + my $cmp = lc($alast||"") cmp lc($blast||""); + return $cmp if $cmp; + + my ($a2last) = $a =~ /(\S+)\s\S+$/; + my ($b2last) = $b =~ /(\S+)\s\S+$/; + lc($a2last||"") cmp lc($b2last||""); +} keys %$contributors; $template->param( contributors => \@people ); $template->param( maintenance_team => $teams->{team}->{$dev_team} );