use C4::Context;
use C4::Installer;
+use Koha;
+
#use Smart::Comments '####';
my $query = new CGI;
}
);
-my $kohaVersion = C4::Context::KOHAVERSION;
+my $kohaVersion = Koha::version();
my $osVersion = `uname -a`;
my $perl_path = $^X;
if ($^O ne 'VMS') {
}
my $perlVersion = $];
my $mysqlVersion = `mysql -V`;
-my $apacheVersion = `httpd -v 2> /dev/null`;
-$apacheVersion = `httpd2 -v 2> /dev/null` unless $apacheVersion;
-$apacheVersion = (`/usr/sbin/apache2 -V`)[0] unless $apacheVersion;
+# 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`;
# Additional system information for warnings
if C4::Context->config('zebra_bib_index_mode') eq 'grs1';
}
-if ( (C4::Context->config('zebra_bib_index_mode') eq 'dom') && ($context->{'server'}->{'biblioserver'}->{'config'} !~ /zebra-biblios-dom.cfg/) ) {
+if ( (C4::Context->config('zebra_bib_index_mode') eq 'dom') &&
+ ($context->{'server'}->{'biblioserver'}->{'config'} !~ /zebra-biblios-dom.cfg/) ) {
+
push @xml_config_warnings, {
error => 'zebra_bib_index_mode_mismatch_warn'
};
}
-if ( (C4::Context->config('zebra_auth_index_mode') eq 'grs1') && ($context->{'server'}->{'biblioserver'}->{'config'} =~ /zebra-biblios-dom.cfg/) ) {
+if ( (C4::Context->config('zebra_bib_index_mode') eq 'grs1') &&
+ ($context->{'server'}->{'biblioserver'}->{'config'} =~ /zebra-biblios-dom.cfg/) ) {
+
push @xml_config_warnings, {
error => 'zebra_bib_index_mode_mismatch_warn'
};