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

(-)a/C4/Auth.pm (-3 / +6 lines)
Lines 404-409 sub get_template_and_user { Link Here
404
        } elsif (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv && C4::Context->userenv->{'branch'}) {
404
        } elsif (C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv && C4::Context->userenv->{'branch'}) {
405
            $opac_name = C4::Context->userenv->{'branch'};
405
            $opac_name = C4::Context->userenv->{'branch'};
406
        }
406
        }
407
        # FIXME Under Plack the CGI->https method always returns 'OFF' ($using_https will be set to 0 in this case)
408
        my $opac_base_url = C4::Context->preference("OPACBaseURL"); #FIXME uses $using_https below as well
409
        if (!$opac_base_url){
410
            $opac_base_url = $ENV{'SERVER_NAME'} . ($ENV{'SERVER_PORT'} eq ($using_https ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}");
411
        }
407
        $template->param(
412
        $template->param(
408
            opaccolorstylesheet       => C4::Context->preference("opaccolorstylesheet"),
413
            opaccolorstylesheet       => C4::Context->preference("opaccolorstylesheet"),
409
            AnonSuggestions           => "" . C4::Context->preference("AnonSuggestions"),
414
            AnonSuggestions           => "" . C4::Context->preference("AnonSuggestions"),
Lines 424-431 sub get_template_and_user { Link Here
424
            OPACMobileUserCSS         => "". C4::Context->preference("OPACMobileUserCSS"),
429
            OPACMobileUserCSS         => "". C4::Context->preference("OPACMobileUserCSS"),
425
            OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"),
430
            OPACViewOthersSuggestions => "" . C4::Context->preference("OPACViewOthersSuggestions"),
426
            OpacAuthorities           => C4::Context->preference("OpacAuthorities"),
431
            OpacAuthorities           => C4::Context->preference("OpacAuthorities"),
427
            OPACBaseURL               => ($in->{'query'}->https() ? "https://" : "http://") . $ENV{'SERVER_NAME'} .
432
            OPACBaseURL               => ($using_https ? "https://" : "http://") . $opac_base_url,
428
                   ($ENV{'SERVER_PORT'} eq ($in->{'query'}->https() ? "443" : "80") ? '' : ":$ENV{'SERVER_PORT'}"),
429
            opac_css_override         => $ENV{'OPAC_CSS_OVERRIDE'},
433
            opac_css_override         => $ENV{'OPAC_CSS_OVERRIDE'},
430
            opac_search_limit         => $opac_search_limit,
434
            opac_search_limit         => $opac_search_limit,
431
            opac_limit_override       => $opac_limit_override,
435
            opac_limit_override       => $opac_limit_override,
432
- 

Return to bug 11575