From 9b43f15602ded559e1fefb96fad6e977639edacc Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 5 Aug 2020 13:48:59 +0000 Subject: [PATCH] Bug 25360: (follow-up) Remove the https FIXME in Auth.pm The FIXME is no longer valid since we fixed the X-Forwarded headers for Plack. And since we do not even use using_https anymore in the templates (see bug 21094). Test plan: Run Auth.t Git grep for using_https Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize Signed-off-by: Lucas Gass (cherry picked from commit 5f6fb719bf6f6e6e0f830f97561ddc6e29012071) --- C4/Auth.pm | 6 ------ installer/html-template-to-template-toolkit.pl | 12 ++++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 6d75d5ffa5..367989db01 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -452,11 +452,6 @@ sub get_template_and_user { # 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( @@ -475,7 +470,6 @@ sub get_template_and_user { 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'), diff --git a/installer/html-template-to-template-toolkit.pl b/installer/html-template-to-template-toolkit.pl index 60cd951dd1..2b9084b4b2 100755 --- a/installer/html-template-to-template-toolkit.pl +++ b/installer/html-template-to-template-toolkit.pl @@ -27,12 +27,12 @@ my $tmpl_in_dir = 'koha-tmpl'; 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","using_https"); +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; -- 2.39.5