From 9aae31243175b51943b022ae1b2690a12b62dfe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Tue, 2 Feb 2016 11:34:16 +0100 Subject: [PATCH] Bug 15721: About page does not display Apache version This patch changes about.pl to get version information from C4::Context where applicable and fixes missing display of the Apache version e.g. for Apache/2.2.22 To test: - Without patch, open about page in staff client - Remember contents of tab 'Server information' (e.g. make a screenshot) - Apply patch - Verify, that the About page displays the same information as before rsp. additionally displays Apache version if it was missing without patch. --- about.pl | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/about.pl b/about.pl index 01e941c..4bf9779 100755 --- a/about.pl +++ b/about.pl @@ -51,18 +51,11 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( } ); -my $kohaVersion = Koha::version(); -my $osVersion = `uname -a`; my $perl_path = $^X; if ($^O ne 'VMS') { $perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i; } -my $perlVersion = $]; -my $mysqlVersion = `mysql -V`; -# Get Apache version -my $apacheVersion = (`apache2ctl -v`)[0]; -$apacheVersion = `httpd2 -v 2> /dev/null` unless $apacheVersion; -$apacheVersion = `httpd -v 2> /dev/null` unless $apacheVersion; + my $zebraVersion = `zebraidx -V`; # Check running PSGI env @@ -255,14 +248,16 @@ if ( C4::Context->preference('WebBasedSelfCheck') } +my %versions = C4::Context::get_versions(); + $template->param( - kohaVersion => $kohaVersion, - osVersion => $osVersion, + kohaVersion => $versions{'kohaVersion'}, + osVersion => $versions{'osVersion'}, perlPath => $perl_path, - perlVersion => $perlVersion, + perlVersion => $versions{'perlVersion'}, perlIncPath => [ map { perlinc => $_ }, @INC ], - mysqlVersion => $mysqlVersion, - apacheVersion => $apacheVersion, + mysqlVersion => $versions{'mysqlVersion'}, + apacheVersion => $versions{'apacheVersion'}, zebraVersion => $zebraVersion, prefBiblioAddsAuthorities => $prefBiblioAddsAuthorities, prefAutoCreateAuthorities => $prefAutoCreateAuthorities, -- 1.7.10.4