Attachment #107834 for bug #25360

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





    # these template parameters are set the same regardless of $in->{'type'}

    # Set the using_https variable for templates
    # FIXME Under Plack the CGI->https method always returns 'OFF'
    my $https = $in->{query}->https();
    my $using_https = ( defined $https and $https ne 'OFF' ) ? 1 : 0;

    my $minPasswordLength = C4::Context->preference('minPasswordLength');
    $minPasswordLength = 3 if not $minPasswordLength or $minPasswordLength < 3;
    $template->param(

        singleBranchMode   => ( Koha::Libraries->search->count == 1 ),
        XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"),
        XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"),
        using_https        => $using_https,
        noItemTypeImages   => C4::Context->preference("noItemTypeImages"),
        marcflavour        => C4::Context->preference("marcflavour"),
        OPACBaseURL        => C4::Context->preference('OPACBaseURL'),




my $tmpl_out_dir     = 'koha-tt';

# template toolkit variables NOT to scope, in other words, variables that need to remain global (case sensitive)
my @globals = ( "themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets","BakerTaylorEnabled",
    "SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages",
    "virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay",
    "OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled",
    "TagsShowOnList", "TagsInputOnList","loggedinusername","opacbookbag",
    "OPACAmazonEnabled", "SyndeticsCoverImages" );

# Arguments:
my $KOHA_ROOT;
- 

Return to bug 25360

Lines 450-460 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (-6 lines)
450		450
451	# these template parameters are set the same regardless of $in->{'type'}	451	# these template parameters are set the same regardless of $in->{'type'}
452		452
453	# Set the using_https variable for templates
454	# FIXME Under Plack the CGI->https method always returns 'OFF'
455	my $https = $in->{query}->https();
456	my $using_https = ( defined $https and $https ne 'OFF' ) ? 1 : 0;
457
458	my $minPasswordLength = C4::Context->preference('minPasswordLength');	453	my $minPasswordLength = C4::Context->preference('minPasswordLength');
459	$minPasswordLength = 3 if not $minPasswordLength or $minPasswordLength < 3;	454	$minPasswordLength = 3 if not $minPasswordLength or $minPasswordLength < 3;
460	$template->param(	455	$template->param(
Lines 473-479 sub get_template_and_user { Link Here
473	singleBranchMode => ( Koha::Libraries->search->count == 1 ),	468	singleBranchMode => ( Koha::Libraries->search->count == 1 ),
474	XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"),	469	XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"),
475	XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"),	470	XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"),
476	using_https => $using_https,
477	noItemTypeImages => C4::Context->preference("noItemTypeImages"),	471	noItemTypeImages => C4::Context->preference("noItemTypeImages"),
478	marcflavour => C4::Context->preference("marcflavour"),	472	marcflavour => C4::Context->preference("marcflavour"),
479	OPACBaseURL => C4::Context->preference('OPACBaseURL'),	473	OPACBaseURL => C4::Context->preference('OPACBaseURL'),

Lines 27-38 my $tmpl_in_dir = 'koha-tmpl'; Link Here

(-)a/installer/html-template-to-template-toolkit.pl (-7 / +6 lines)
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	-