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

(-)a/C4/Auth.pm (-7 / +1 lines)
Lines 383-388 sub get_template_and_user { Link Here
383
        noItemTypeImages   => C4::Context->preference("noItemTypeImages"),
383
        noItemTypeImages   => C4::Context->preference("noItemTypeImages"),
384
        marcflavour        => C4::Context->preference("marcflavour"),
384
        marcflavour        => C4::Context->preference("marcflavour"),
385
        persona            => C4::Context->preference("persona"),
385
        persona            => C4::Context->preference("persona"),
386
        OPACBaseURL        => C4::Context->preference('OPACBaseURL'),
386
    );
387
    );
387
    if ( $in->{'type'} eq "intranet" ) {
388
    if ( $in->{'type'} eq "intranet" ) {
388
        $template->param(
389
        $template->param(
Lines 453-463 sub get_template_and_user { Link Here
453
            $opac_name = C4::Context->userenv->{'branch'};
454
            $opac_name = C4::Context->userenv->{'branch'};
454
        }
455
        }
455
456
456
        # FIXME Under Plack the CGI->https method always returns 'OFF' ($using_https will be set to 0 in this case)
457
        my $opac_base_url = C4::Context->preference("OPACBaseURL");    #FIXME uses $using_https below as well
458
        if ( !$opac_base_url ) {
459
            $opac_base_url = $ENV{'SERVER_NAME'} . ( $ENV{'SERVER_PORT'} eq ( $using_https ? "443" : "80" ) ? '' : ":$ENV{'SERVER_PORT'}" );
460
        }
461
        $template->param(
457
        $template->param(
462
            opaccolorstylesheet                   => C4::Context->preference("opaccolorstylesheet"),
458
            opaccolorstylesheet                   => C4::Context->preference("opaccolorstylesheet"),
463
            AnonSuggestions                       => "" . C4::Context->preference("AnonSuggestions"),
459
            AnonSuggestions                       => "" . C4::Context->preference("AnonSuggestions"),
Lines 477-483 sub get_template_and_user { Link Here
477
            OPACUserCSS                           => "" . C4::Context->preference("OPACUserCSS"),
473
            OPACUserCSS                           => "" . C4::Context->preference("OPACUserCSS"),
478
            OPACViewOthersSuggestions             => "" . C4::Context->preference("OPACViewOthersSuggestions"),
474
            OPACViewOthersSuggestions             => "" . C4::Context->preference("OPACViewOthersSuggestions"),
479
            OpacAuthorities                       => C4::Context->preference("OpacAuthorities"),
475
            OpacAuthorities                       => C4::Context->preference("OpacAuthorities"),
480
            OPACBaseURL                           => ( $using_https ? "https://" : "http://" ) . $opac_base_url,
481
            opac_css_override                     => $ENV{'OPAC_CSS_OVERRIDE'},
476
            opac_css_override                     => $ENV{'OPAC_CSS_OVERRIDE'},
482
            opac_search_limit                     => $opac_search_limit,
477
            opac_search_limit                     => $opac_search_limit,
483
            opac_limit_override                   => $opac_limit_override,
478
            opac_limit_override                   => $opac_limit_override,
484
- 

Return to bug 5010