View | Details | Raw Unified | Return to bug 7895
Collapse All | Expand All

(-)a/about.pl (-2 / +12 lines)
Lines 20-29 Link Here
20
# You should have received a copy of the GNU General Public License
20
# You should have received a copy of the GNU General Public License
21
# along with Koha; if not, see <http://www.gnu.org/licenses>.
21
# along with Koha; if not, see <http://www.gnu.org/licenses>.
22
22
23
use strict;
23
use Modern::Perl;
24
use warnings;
25
24
26
use CGI qw ( -utf8 );
25
use CGI qw ( -utf8 );
26
use List::MoreUtils qw/ any /;
27
use LWP::Simple;
27
use LWP::Simple;
28
use XML::Simple;
28
use XML::Simple;
29
use Config;
29
use Config;
Lines 65-70 $apacheVersion = `httpd2 -v 2> /dev/null` unless $apacheVersion; Link Here
65
$apacheVersion    = `httpd -v 2> /dev/null` unless $apacheVersion;
65
$apacheVersion    = `httpd -v 2> /dev/null` unless $apacheVersion;
66
my $zebraVersion = `zebraidx -V`;
66
my $zebraVersion = `zebraidx -V`;
67
67
68
# Check running PSGI env
69
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
70
    $template->param(
71
        is_psgi => 1,
72
        psgi_server => ($ENV{ PLACK_ENV }) ? "Plack ($ENV{PLACK_ENV})" :
73
                       ($ENV{ MOD_PERL })  ? "mod_perl ($ENV{MOD_PERL})" :
74
                                             'Unknown'
75
    );
76
}
77
68
# Additional system information for warnings
78
# Additional system information for warnings
69
my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities');
79
my $prefAutoCreateAuthorities = C4::Context->preference('AutoCreateAuthorities');
70
my $prefBiblioAddsAuthorities = C4::Context->preference('BiblioAddsAuthorities');
80
my $prefBiblioAddsAuthorities = C4::Context->preference('BiblioAddsAuthorities');
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-1 / +3 lines)
Lines 48-53 Link Here
48
            </td></tr>
48
            </td></tr>
49
            <tr><th scope="row">MySQL version: </th><td>[% mysqlVersion |html %]</td></tr>
49
            <tr><th scope="row">MySQL version: </th><td>[% mysqlVersion |html %]</td></tr>
50
            <tr><th scope="row">Apache version: </th><td>[% apacheVersion |html %]</td></tr>
50
            <tr><th scope="row">Apache version: </th><td>[% apacheVersion |html %]</td></tr>
51
          [% IF (is_psgi) %]
52
            <tr><th scope="row">PSGI: </th><td>[% psgi_server |html %]</td></tr>
53
          [% END %]
51
            <tr><th scope="row">Zebra version: </th><td>[% zebraVersion |html %]</td></tr>
54
            <tr><th scope="row">Zebra version: </th><td>[% zebraVersion |html %]</td></tr>
52
            [% IF (errZebraConnection == 10000) %]
55
            [% IF (errZebraConnection == 10000) %]
53
            <tr><th scope="row"><b>Error</b> </th><td>Zebra server seems not to be available. Is it started?</td></tr>
56
            <tr><th scope="row"><b>Error</b> </th><td>Zebra server seems not to be available. Is it started?</td></tr>
54
- 

Return to bug 7895