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

(-)a/C4/Auth.pm (+1 lines)
Lines 435-440 sub get_template_and_user { Link Here
435
        marcflavour        => C4::Context->preference("marcflavour"),
435
        marcflavour        => C4::Context->preference("marcflavour"),
436
        persona            => C4::Context->preference("persona"),
436
        persona            => C4::Context->preference("persona"),
437
        OPACBaseURL        => C4::Context->preference('OPACBaseURL'),
437
        OPACBaseURL        => C4::Context->preference('OPACBaseURL'),
438
        is_psgi            => C4::Context->is_psgi ? 1 : 0,
438
    );
439
    );
439
    if ( $in->{'type'} eq "intranet" ) {
440
    if ( $in->{'type'} eq "intranet" ) {
440
        $template->param(
441
        $template->param(
(-)a/C4/Context.pm (+13 lines)
Lines 113-118 use POSIX (); Link Here
113
use DateTime::TimeZone;
113
use DateTime::TimeZone;
114
use Module::Load::Conditional qw(can_load);
114
use Module::Load::Conditional qw(can_load);
115
use Carp;
115
use Carp;
116
use List::MoreUtils qw(any);
116
117
117
use C4::Boolean;
118
use C4::Boolean;
118
use C4::Debug;
119
use C4::Debug;
Lines 1140-1145 sub interface { Link Here
1140
    return $context->{interface} // 'opac';
1141
    return $context->{interface} // 'opac';
1141
}
1142
}
1142
1143
1144
=head2 interface
1145
1146
    C4::Context->is_psgi
1147
1148
    Returns if using PSGI mode (Plack) instead of CGI mode
1149
1150
=cut
1151
1152
sub is_psgi {
1153
    return any { /(^psgi\.|^plack\.)/i } keys %ENV;
1154
}
1155
1143
1;
1156
1;
1144
__END__
1157
__END__
1145
1158
(-)a/Koha/AuthUtils.pm (-2 / +2 lines)
Lines 21-27 use Modern::Perl; Link Here
21
use Crypt::Eksblowfish::Bcrypt qw(bcrypt en_base64);
21
use Crypt::Eksblowfish::Bcrypt qw(bcrypt en_base64);
22
use Encode qw( encode is_utf8 );
22
use Encode qw( encode is_utf8 );
23
use Fcntl qw/O_RDONLY/; # O_RDONLY is used in generate_salt
23
use Fcntl qw/O_RDONLY/; # O_RDONLY is used in generate_salt
24
use List::MoreUtils qw/ any /;
24
use C4::Context;
25
25
26
use base 'Exporter';
26
use base 'Exporter';
27
27
Lines 145-151 outside this context. Link Here
145
sub get_script_name {
145
sub get_script_name {
146
    # This is the method about.pl uses to detect Plack; now that two places use it, it MUST be
146
    # This is the method about.pl uses to detect Plack; now that two places use it, it MUST be
147
    # right.
147
    # right.
148
    if ( ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) && $ENV{SCRIPT_NAME} =~ m,^/(intranet|opac)(.*), ) {
148
    if ( ( C4::Context->is_psgi ) && $ENV{SCRIPT_NAME} =~ m,^/(intranet|opac)(.*), ) {
149
        return '/cgi-bin/koha' . $2;
149
        return '/cgi-bin/koha' . $2;
150
    } else {
150
    } else {
151
        return $ENV{SCRIPT_NAME};
151
        return $ENV{SCRIPT_NAME};
(-)a/about.pl (-4 / +1 lines)
Lines 23-29 Link Here
23
use Modern::Perl;
23
use Modern::Perl;
24
24
25
use CGI qw ( -utf8 );
25
use CGI qw ( -utf8 );
26
use List::MoreUtils qw/ any /;
27
use LWP::Simple;
26
use LWP::Simple;
28
use XML::Simple;
27
use XML::Simple;
29
use Config;
28
use Config;
Lines 61-69 if ($^O ne 'VMS') { Link Here
61
my $zebraVersion = `zebraidx -V`;
60
my $zebraVersion = `zebraidx -V`;
62
61
63
# Check running PSGI env
62
# Check running PSGI env
64
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
63
if ( C4::Context->is_psgi ) {
65
    $template->param(
64
    $template->param(
66
        is_psgi => 1,
67
        psgi_server => ($ENV{ PLACK_ENV }) ? "Plack ($ENV{PLACK_ENV})" :
65
        psgi_server => ($ENV{ PLACK_ENV }) ? "Plack ($ENV{PLACK_ENV})" :
68
                       ($ENV{ MOD_PERL })  ? "mod_perl ($ENV{MOD_PERL})" :
66
                       ($ENV{ MOD_PERL })  ? "mod_perl ($ENV{MOD_PERL})" :
69
                                             'Unknown'
67
                                             'Unknown'
70
- 

Return to bug 17240