X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=about.pl;h=339f4e2820da5051cf8b256d3834f7e4781975d0;hb=91eb4252c7a120a6137123175e331dbe2f79dd77;hp=596637d7f6b59f7f6400a2228cd381a243d5ca34;hpb=c0234dd9b9649063acf2617fecf5c6efda38a532;p=koha.git

diff --git a/about.pl b/about.pl
index 596637d7f6..339f4e2820 100755
--- a/about.pl
+++ b/about.pl
@@ -33,10 +33,12 @@ use C4::Auth;
 use C4::Context;
 use C4::Installer;
 
+#use Smart::Comments '####';
+
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "about.tmpl",
+        template_name   => "about.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
@@ -53,11 +55,85 @@ if ($^O ne 'VMS') {
 }
 my $perlVersion   = $];
 my $mysqlVersion  = `mysql -V`;
-my $apacheVersion = `httpd -v`;
-$apacheVersion = `httpd2 -v` unless $apacheVersion;
+my $apacheVersion = `httpd -v 2> /dev/null`;
+$apacheVersion = `httpd2 -v 2> /dev/null` unless $apacheVersion;
 $apacheVersion = (`/usr/sbin/apache2 -V`)[0] unless $apacheVersion;
 my $zebraVersion = `zebraidx -V`;
 
+# Additional system information for warnings
+my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities');
+my $prefBiblioAddsAuthorities = C4::Context->preference('BiblioAddsAuthorities');
+my $warnPrefBiblioAddsAuthorities = ( $prefAutoCreateAuthorities && ( !$prefBiblioAddsAuthorities) );
+
+my $prefEasyAnalyticalRecords  = C4::Context->preference('EasyAnalyticalRecords');
+my $prefUseControlNumber  = C4::Context->preference('UseControlNumber');
+my $warnPrefEasyAnalyticalRecords  = ( $prefEasyAnalyticalRecords  && $prefUseControlNumber );
+my $warnPrefAnonymousPatron = (
+    C4::Context->preference('OPACPrivacy')
+        and not C4::Context->preference('AnonymousPatron')
+);
+
+my $errZebraConnection = C4::Context->Zconn("biblioserver",0)->errcode();
+
+my $warnIsRootUser   = (! $loggedinuser);
+
+my $warnNoActiveCurrency = (! defined C4::Budgets->GetCurrency());
+my @xml_config_warnings;
+
+if ( ! defined C4::Context->config('zebra_bib_index_mode') ) {
+    push @xml_config_warnings, {
+        error => 'zebra_bib_index_mode_warn'
+    };
+}
+
+if ( ! defined C4::Context->config('zebra_auth_index_mode') ) {
+    push @xml_config_warnings, {
+        error => 'zebra_auth_index_mode_warn'
+    };
+}
+
+# Test QueryParser configuration sanity
+if ( C4::Context->preference( 'UseQueryParser' ) ) {
+    # Get the QueryParser configuration file name
+    my $queryparser_file          = C4::Context->config( 'queryparser_config' );
+    my $queryparser_fallback_file = '/etc/koha/searchengine/queryparser.yaml';
+    # Check QueryParser is functional
+    my $QParser = C4::Context->queryparser();
+    my $queryparser_error = {};
+    if ( ! defined $QParser || ref($QParser) ne 'Koha::QueryParser::Driver::PQF' ) {
+        # Error initializing the QueryParser object
+        # Get the used queryparser.yaml file path to report the user
+        $queryparser_error->{ fallback } = ( defined $queryparser_file ) ? 0 : 1;
+        $queryparser_error->{ file }     = ( defined $queryparser_file )
+                                                ? $queryparser_file
+                                                : $queryparser_fallback_file;
+        # Report error data to the template
+        $template->param( QueryParserError => $queryparser_error );
+    } else {
+        # Check for an absent queryparser_config entry in koha-conf.xml
+        if ( ! defined $queryparser_file ) {
+            # Not an error but a warning for the missing entry in koha-conf-xml
+            push @xml_config_warnings, {
+                    error => 'queryparser_entry_missing',
+                    file  => $queryparser_fallback_file
+            };
+        }
+    }
+}
+
+# Test Zebra facets configuration
+if ( !defined C4::Context->config('use_zebra_facets') ) {
+    push @xml_config_warnings, { error => 'use_zebra_facets_entry_missing' };
+} else {
+    if ( C4::Context->config('use_zebra_facets') &&
+         C4::Context->config('zebra_bib_index_mode') ) {
+        # use_zebra_facets works with DOM
+        push @xml_config_warnings, {
+            error => 'use_zebra_facets_needs_dom'
+        } if C4::Context->config('zebra_bib_index_mode') ne 'dom' ;
+    }
+}
+
 $template->param(
     kohaVersion   => $kohaVersion,
     osVersion     => $osVersion,
@@ -67,6 +143,15 @@ $template->param(
     mysqlVersion  => $mysqlVersion,
     apacheVersion => $apacheVersion,
     zebraVersion  => $zebraVersion,
+    prefBiblioAddsAuthorities => $prefBiblioAddsAuthorities,
+    prefAutoCreateAuthorities => $prefAutoCreateAuthorities,
+    warnPrefBiblioAddsAuthorities => $warnPrefBiblioAddsAuthorities,
+    warnPrefEasyAnalyticalRecords  => $warnPrefEasyAnalyticalRecords,
+    warnPrefAnonymousPatron => $warnPrefAnonymousPatron,
+    errZebraConnection => $errZebraConnection,
+    warnIsRootUser => $warnIsRootUser,
+    warnNoActiveCurrency => $warnNoActiveCurrency,
+    xml_config_warnings => \@xml_config_warnings,
 );
 
 my @components = ();
@@ -89,6 +174,7 @@ foreach my $pm_type(@pm_types) {
                 upgrade => ($pm_type eq 'upgrade_pm' ? 1 : 0),
                 current => ($pm_type eq 'current_pm' ? 1 : 0),
                 require => $stats->{'required'},
+                reqversion => $stats->{'min_ver'},
             }
         );
     }
@@ -106,7 +192,68 @@ foreach (@components) {
         $row = [];
     }
 }
+# Processing the last line (if there are any modules left)
+if (scalar(@$row) > 0) {
+    # Extending $row to the table size
+    $$row[3] = '';
+    # Pushing the last line
+    push (@$table, {row => $row});
+}
+## ## $table
 
 $template->param( table => $table );
 
+
+## ------------------------------------------
+## Koha time line code
+
+#get file location
+my $docdir;
+if ( defined C4::Context->config('docdir') ) {
+    $docdir = C4::Context->config('docdir');
+} else {
+    # if no <docdir> is defined in koha-conf.xml, use the default location
+    # this is a work-around to stop breakage on upgraded Kohas, bug 8911
+    $docdir = C4::Context->config('intranetdir') . '/docs';
+}
+
+if ( open( my $file, "<", "$docdir" . "/history.txt" ) ) {
+
+    my $i = 0;
+
+    my @rows2 = ();
+    my $row2  = [];
+
+    my @lines = <$file>;
+    close($file);
+
+    shift @lines; #remove header row
+
+    foreach (@lines) {
+        my ( $date, $desc, $tag ) = split(/\t/);
+        if(!$desc && $date=~ /(?<=\d{4})\s+/) {
+            ($date, $desc)= ($`, $');
+        }
+        push(
+            @rows2,
+            {
+                date => $date,
+                desc => $desc,
+            }
+        );
+    }
+
+    my $table2 = [];
+    #foreach my $row2 (@rows2) {
+    foreach  (@rows2) {
+        push (@$row2, $_);
+        push( @$table2, { row2 => $row2 } );
+        $row2 = [];
+    }
+
+    $template->param( table2 => $table2 );
+} else {
+    $template->param( timeline_read_error => 1 );
+}
+
 output_html_with_http_headers $query, $cookie, $template->output;