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

(-)a/C4/Auth.pm (+1 lines)
Lines 466-471 sub get_template_and_user { Link Here
466
        marcflavour        => C4::Context->preference("marcflavour"),
466
        marcflavour        => C4::Context->preference("marcflavour"),
467
        OPACBaseURL        => C4::Context->preference('OPACBaseURL'),
467
        OPACBaseURL        => C4::Context->preference('OPACBaseURL'),
468
        minPasswordLength  => $minPasswordLength,
468
        minPasswordLength  => $minPasswordLength,
469
        is_psgi            => C4::Context->is_psgi ? 1 : 0,
469
    );
470
    );
470
    if ( $in->{'type'} eq "intranet" ) {
471
    if ( $in->{'type'} eq "intranet" ) {
471
        $template->param(
472
        $template->param(
(-)a/C4/Context.pm (+12 lines)
Lines 97-102 use File::Spec; Link Here
97
use Module::Load::Conditional qw(can_load);
97
use Module::Load::Conditional qw(can_load);
98
use POSIX ();
98
use POSIX ();
99
use ZOOM;
99
use ZOOM;
100
use List::MoreUtils qw(any);
100
101
101
use C4::Boolean;
102
use C4::Boolean;
102
use C4::Debug;
103
use C4::Debug;
Lines 1087-1092 sub temporary_directory { Link Here
1087
    return C4::Context->config('tmp_path') || File::Spec->tmpdir;
1088
    return C4::Context->config('tmp_path') || File::Spec->tmpdir;
1088
}
1089
}
1089
1090
1091
=head2 interface
1092
1093
    C4::Context->is_psgi
1094
1095
    Returns if using PSGI mode (Plack) instead of CGI mode
1096
1097
=cut
1098
1099
sub is_psgi {
1100
    return any { /(^psgi\.|^plack\.)/i } keys %ENV;
1101
}
1090
1102
1091
1;
1103
1;
1092
1104
(-)a/Koha/AuthUtils.pm (-2 / +1 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 /;
25
use String::Random qw( random_string );
24
use String::Random qw( random_string );
26
25
27
use C4::Context;
26
use C4::Context;
Lines 193-199 outside this context. Link Here
193
sub get_script_name {
192
sub get_script_name {
194
    # This is the method about.pl uses to detect Plack; now that two places use it, it MUST be
193
    # This is the method about.pl uses to detect Plack; now that two places use it, it MUST be
195
    # right.
194
    # right.
196
    if ( ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) && $ENV{SCRIPT_NAME} =~ m,^/(intranet|opac)(.*), ) {
195
    if ( C4::Context->is_psgi && $ENV{SCRIPT_NAME} =~ m,^/(intranet|opac)(.*), ) {
197
        return '/cgi-bin/koha' . $2;
196
        return '/cgi-bin/koha' . $2;
198
    } else {
197
    } else {
199
        return $ENV{SCRIPT_NAME};
198
        return $ENV{SCRIPT_NAME};
(-)a/about.pl (-4 / +1 lines)
Lines 25-31 use Modern::Perl; Link Here
25
use CGI qw ( -utf8 );
25
use CGI qw ( -utf8 );
26
use DateTime::TimeZone;
26
use DateTime::TimeZone;
27
use File::Spec;
27
use File::Spec;
28
use List::MoreUtils qw/ any /;
29
use LWP::Simple;
28
use LWP::Simple;
30
use Module::Load::Conditional qw(can_load);
29
use Module::Load::Conditional qw(can_load);
31
use XML::Simple;
30
use XML::Simple;
Lines 105-113 if ($^O ne 'VMS') { Link Here
105
my $zebraVersion = `zebraidx -V`;
104
my $zebraVersion = `zebraidx -V`;
106
105
107
# Check running PSGI env
106
# Check running PSGI env
108
if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) {
107
if ( C4::Context->is_psgi ) {
109
    $template->param(
108
    $template->param(
110
        is_psgi => 1,
111
        psgi_server => ($ENV{ PLACK_ENV }) ? "Plack ($ENV{PLACK_ENV})" :
109
        psgi_server => ($ENV{ PLACK_ENV }) ? "Plack ($ENV{PLACK_ENV})" :
112
                       ($ENV{ MOD_PERL })  ? "mod_perl ($ENV{MOD_PERL})" :
110
                       ($ENV{ MOD_PERL })  ? "mod_perl ($ENV{MOD_PERL})" :
113
                                             'Unknown'
111
                                             'Unknown'
114
- 

Return to bug 17240