X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=about.pl;h=96a8b5a683c520c6e598fcd577c0e6c6e240d3d8;hb=151e22070a189f10dd38e53a1636110a72066fe3;hp=daf682950f3992673f632b89a57f3547e6c84574;hpb=8648c21ddf975d9c8b589c8457e73e511077a05b;p=koha.git diff --git a/about.pl b/about.pl index daf682950f..96a8b5a683 100755 --- a/about.pl +++ b/about.pl @@ -55,13 +55,12 @@ 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 $prefNoZebra = C4::Context->preference('nozebra'); my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities'); my $prefBiblioAddsAuthorities = C4::Context->preference('BiblioAddsAuthorities'); my $warnPrefBiblioAddsAuthorities = ( $prefAutoCreateAuthorities && ( !$prefBiblioAddsAuthorities) ); @@ -72,6 +71,8 @@ my $warnPrefEasyAnalyticalRecords = ( $prefEasyAnalyticalRecords && $prefUseCo my $errZebraConnection = C4::Context->Zconn("biblioserver",0)->errcode(); +my $warnIsRootUser = (! $loggedinuser); + $template->param( kohaVersion => $kohaVersion, osVersion => $osVersion, @@ -81,12 +82,12 @@ $template->param( mysqlVersion => $mysqlVersion, apacheVersion => $apacheVersion, zebraVersion => $zebraVersion, - prefNoZebra => $prefNoZebra, prefBiblioAddsAuthorities => $prefBiblioAddsAuthorities, prefAutoCreateAuthorities => $prefAutoCreateAuthorities, warnPrefBiblioAddsAuthorities => $warnPrefBiblioAddsAuthorities, warnPrefEasyAnalyticalRecords => $warnPrefEasyAnalyticalRecords, errZebraConnection => $errZebraConnection, + warnIsRootUser => $warnIsRootUser, ); my @components = ();