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

(-)a/C4/Auth_with_shibboleth.pm (-3 / +3 lines)
Lines 81-87 sub get_login_shib { Link Here
81
81
82
    my $matchAttribute = $config->{mapping}->{ $config->{matchpoint} }->{is};
82
    my $matchAttribute = $config->{mapping}->{ $config->{matchpoint} }->{is};
83
83
84
    if ( C4::Context::psgi_env ) {
84
    if ( C4::Context->psgi_env ) {
85
      return $ENV{"HTTP_".uc($matchAttribute)} || '';
85
      return $ENV{"HTTP_".uc($matchAttribute)} || '';
86
    } else {
86
    } else {
87
      return $ENV{$matchAttribute} || '';
87
      return $ENV{$matchAttribute} || '';
Lines 126-132 sub _autocreate { Link Here
126
    my %borrower = ( $config->{matchpoint} => $match );
126
    my %borrower = ( $config->{matchpoint} => $match );
127
127
128
    while ( my ( $key, $entry ) = each %{$config->{'mapping'}} ) {
128
    while ( my ( $key, $entry ) = each %{$config->{'mapping'}} ) {
129
        if ( C4::Context::psgi_env ) {
129
        if ( C4::Context->psgi_env ) {
130
            $borrower{$key} = ( $entry->{'is'} && $ENV{"HTTP_" . uc($entry->{'is'}) } ) || $entry->{'content'} || '';
130
            $borrower{$key} = ( $entry->{'is'} && $ENV{"HTTP_" . uc($entry->{'is'}) } ) || $entry->{'content'} || '';
131
        } else {
131
        } else {
132
            $borrower{$key} = ( $entry->{'is'} && $ENV{ $entry->{'is'} } ) || $entry->{'content'} || '';
132
            $borrower{$key} = ( $entry->{'is'} && $ENV{ $entry->{'is'} } ) || $entry->{'content'} || '';
Lines 144-150 sub _sync { Link Here
144
    my %borrower;
144
    my %borrower;
145
    $borrower{'borrowernumber'} = $borrowernumber;
145
    $borrower{'borrowernumber'} = $borrowernumber;
146
    while ( my ( $key, $entry ) = each %{$config->{'mapping'}} ) {
146
    while ( my ( $key, $entry ) = each %{$config->{'mapping'}} ) {
147
        if ( C4::Context::psgi_env ) {
147
        if ( C4::Context->psgi_env ) {
148
            $borrower{$key} = ( $entry->{'is'} && $ENV{"HTTP_" . uc($entry->{'is'}) } ) || $entry->{'content'} || '';
148
            $borrower{$key} = ( $entry->{'is'} && $ENV{"HTTP_" . uc($entry->{'is'}) } ) || $entry->{'content'} || '';
149
        } else {
149
        } else {
150
            $borrower{$key} = ( $entry->{'is'} && $ENV{ $entry->{'is'} } ) || $entry->{'content'} || '';
150
            $borrower{$key} = ( $entry->{'is'} && $ENV{ $entry->{'is'} } ) || $entry->{'content'} || '';
(-)a/Koha/AuthUtils.pm (-1 / +1 lines)
Lines 208-214 outside this context. Link Here
208
=cut
208
=cut
209
209
210
sub get_script_name {
210
sub get_script_name {
211
    if ( ( C4::Context::psgi_env ) && $ENV{SCRIPT_NAME} =~ m,^/(intranet|opac)(.*), ) {
211
    if ( ( C4::Context->psgi_env ) && $ENV{SCRIPT_NAME} && $ENV{SCRIPT_NAME} =~ m,^/(intranet|opac)(.*), ) {
212
        return '/cgi-bin/koha' . $2;
212
        return '/cgi-bin/koha' . $2;
213
    } else {
213
    } else {
214
        return $ENV{SCRIPT_NAME};
214
        return $ENV{SCRIPT_NAME};
(-)a/about.pl (-2 / +1 lines)
Lines 125-131 if ($^O ne 'VMS') { Link Here
125
my $zebraVersion = `zebraidx -V`;
125
my $zebraVersion = `zebraidx -V`;
126
126
127
# Check running PSGI env
127
# Check running PSGI env
128
if ( C4::Context::psgi_env ) {
128
if ( C4::Context->psgi_env ) {
129
    $template->param(
129
    $template->param(
130
        is_psgi => 1,
130
        is_psgi => 1,
131
        psgi_server => ($ENV{ PLACK_ENV }) ? "Plack ($ENV{PLACK_ENV})" :
131
        psgi_server => ($ENV{ PLACK_ENV }) ? "Plack ($ENV{PLACK_ENV})" :
132
- 

Return to bug 29744