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

(-)a/C4/Auth.pm (-6 lines)
Lines 451-461 sub get_template_and_user { Link Here
451
451
452
    # these template parameters are set the same regardless of $in->{'type'}
452
    # these template parameters are set the same regardless of $in->{'type'}
453
453
454
    # Set the using_https variable for templates
455
    # FIXME Under Plack the CGI->https method always returns 'OFF'
456
    my $https = $in->{query}->https();
457
    my $using_https = ( defined $https and $https ne 'OFF' ) ? 1 : 0;
458
459
    my $minPasswordLength = C4::Context->preference('minPasswordLength');
454
    my $minPasswordLength = C4::Context->preference('minPasswordLength');
460
    $minPasswordLength = 3 if not $minPasswordLength or $minPasswordLength < 3;
455
    $minPasswordLength = 3 if not $minPasswordLength or $minPasswordLength < 3;
461
    $template->param(
456
    $template->param(
Lines 474-480 sub get_template_and_user { Link Here
474
        singleBranchMode   => ( Koha::Libraries->search->count == 1 ),
469
        singleBranchMode   => ( Koha::Libraries->search->count == 1 ),
475
        XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"),
470
        XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"),
476
        XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"),
471
        XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"),
477
        using_https        => $using_https,
478
        noItemTypeImages   => C4::Context->preference("noItemTypeImages"),
472
        noItemTypeImages   => C4::Context->preference("noItemTypeImages"),
479
        marcflavour        => C4::Context->preference("marcflavour"),
473
        marcflavour        => C4::Context->preference("marcflavour"),
480
        OPACBaseURL        => C4::Context->preference('OPACBaseURL'),
474
        OPACBaseURL        => C4::Context->preference('OPACBaseURL'),
(-)a/installer/html-template-to-template-toolkit.pl (-7 / +6 lines)
Lines 27-38 my $tmpl_in_dir = 'koha-tmpl'; Link Here
27
my $tmpl_out_dir     = 'koha-tt';
27
my $tmpl_out_dir     = 'koha-tt';
28
28
29
# template toolkit variables NOT to scope, in other words, variables that need to remain global (case sensitive)
29
# template toolkit variables NOT to scope, in other words, variables that need to remain global (case sensitive)
30
my @globals = ("themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets","BakerTaylorEnabled",
30
my @globals = ( "themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets","BakerTaylorEnabled",
31
"SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages",
31
    "SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages",
32
"virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay",
32
    "virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay",
33
"OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled",
33
    "OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled",
34
"TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag",
34
    "TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag",
35
"OPACAmazonEnabled", "SyndeticsCoverImages","using_https");
35
    "OPACAmazonEnabled", "SyndeticsCoverImages" );
36
36
37
# Arguments:
37
# Arguments:
38
my $KOHA_ROOT;
38
my $KOHA_ROOT;
39
- 

Return to bug 25360