From cf93255428125241745faaaec0a0b1f8455c7526 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 29 Jul 2020 10:56:37 +0000 Subject: [PATCH] Bug 25639: Add search query strings as global javascript variables To test: 1 - Search on OPAC for "qwertyuiop" 2 - View the HTML source 3 - Find 'qwertyuiop' in the source, it is not easily accessible via JS 4 - Apply patch 5 - Repeat 6 - Note that now there are global variables with the query strings 7 - Add to OpacUserJs: console.log( query_desc ); console.log( querystring ); console.log( query_cgi ); 8 - Reload page and confirm variables are warned in the JS console (Press F12) 9 - Sign off Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 6 ++++++ koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index d9bc539446..3875412a3a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -180,6 +180,12 @@ $.widget.bridge('uitooltip', $.ui.tooltip); var NO_OL_JACKET = _("No cover image available"); var OL_PREVIEW = _("Preview"); [% END %] + [% IF (query_desc) %] + var query_desc = "[% query_desc | html %]"; + var querystring = "[% querystring | html %]"; + var query_cgi = "[% query_cgi | html %]"; + [% END %] + [% IF ( OPACAmazonCoverImages || SyndeticsCoverImages ) %] $(window).load(function() { verify_images(); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 6403e67e7f..2e38caf613 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -884,8 +884,6 @@ $(document).ready(function(){ [% END %] [% IF ( query_desc ) %] - var query_desc = "[% query_desc |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') | html %]"; - var querystring = "[% querystring |replace("'", "\'") |replace('\n', '\\n') |replace('\r', '\\r') | html %]"; [% IF ( OpacHighlightedWords ) %] q_array = query_desc.split(" "); // ensure that we don't have "" at the end of the array, which can -- 2.39.5