From 1562d1f7665d806fd93c4ef429900ebb5f7fa766 Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Tue, 2 May 2023 22:37:37 +0000 Subject: [PATCH] Bug 33259: (follow-up) Add HTML filters to Cookies.set Test plan: Run QA test tools and confirm the no complaints about filters --- .../prog/en/includes/authorities_js.inc | 2 +- .../prog/en/includes/cateditor-ui.inc | 2 +- .../prog/en/modules/admin/marctagstructure.tt | 2 +- .../admin/preferences/.cataloguing.pref.swp | Bin 16384 -> 0 bytes .../prog/en/modules/cataloguing/addbiblio.tt | 10 +++++----- .../prog/en/modules/cataloguing/addbooks.tt | 2 +- .../en/modules/cataloguing/cataloging-home.tt | 2 +- .../prog/en/modules/clubs/clubs.tt | 2 +- .../bootstrap/en/modules/opac-advsearch.tt | 8 ++++---- 9 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/.cataloguing.pref.swp diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc index 2699eadaa3e..737c64e77ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities_js.inc @@ -12,7 +12,7 @@ function mergeAuth(authid, summary) { } window.location.href = "/cgi-bin/koha/authorities/merge.pl?authid=" + authid + "&authid=" + alreadySelected.authid + refstring; } else { - Cookies.set('auth_to_merge', JSON.stringify({ 'authid': authid, 'summary': summary }), { 'path' : '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" }); + Cookies.set('auth_to_merge', JSON.stringify({ 'authid': authid, 'summary': summary }), { 'path' : '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" }); showMergingInProgress(); } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc index 22fddbe6ecb..d74567a24e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc @@ -1226,7 +1226,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr $( '#switch-editor' ).click( function() { if ( !confirm( _("Any changes will not be saved. Continue?") ) ) return; - Cookies.set( "catalogue_editor_[% logged_in_user.borrowernumber | html %]", "basic", { expires: 365, path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" } ); + Cookies.set( "catalogue_editor_[% logged_in_user.borrowernumber | html %]", "basic", { expires: 365, path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" } ); if ( state.backend == 'catalog' ) { window.location = '/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=' + state.recordID; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index 5d504b7b3a8..0705f81dcd4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -325,7 +325,7 @@ MARC frameworks › Administration › Koha })); $("#select_display").on("change",function(){ var checked = $(this).prop("checked") ? 1: 0; - Cookies.set("marctagstructure_selectdisplay", checked, { sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" }); + Cookies.set("marctagstructure_selectdisplay", checked, { sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" }); this.form.submit(); }); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/.cataloguing.pref.swp b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/.cataloguing.pref.swp deleted file mode 100644 index b9c114b6fb2655f08de72a9e64ddec589f3cf231..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeHOON<;x8E%429P+?QPJo0eW6SH6b{=c9;Ecx;_GMUDd##b+ZB#0mg78A# z!4Z+%BYo4`-Bn$Gef8J>n%-vR+|ns_taQY{XTM=w`_cQY1C!^B>%V-!;EvdA#^$;s z`gC{O&rrLf<8Rx{`1DZ2^19dIelxZmO9a!?^0XLreWz@@QNUdhsWU(D+GXLEyPg$0 zA}n*OYrADX5G@f1*TfZ*N8It+vF)}?bbb5r^E){Mw>Ja#8b^;zSBQfHg$LOK_n*DJ z>BwiFGmtZoGmtZoGmtZoGmtZoGjN+R5czwJ&tT4X=y^Y)kMGDF-_)Ov>Feh+_utU> z&*;6dPxy9}cTbb%$H0=yUa`#!_?9qqJPpBj#a4~Glp8SA}gG<9f#R2 zi#mc?ss}Sw7aT3YT3*0f)S00-Tjg$Bu<4oN^oN<(Vy9+T=Z{R|IcFSh3cBLQO~=Ly z6}IP2K@hxiVXD9J7_lkLn9fS8$gh^myq@-%LXjd!q`ee0`PPdr;MFe2tY_aP{{bbG| zi##Uq{>Pw)YB$2=GG-t1wzwHG9o=Uvkw<5WM~8_Fgy{uV$PSBAyF~I#G1m*GSXjsP^bJ~WnRVfh*qW}vT2cnwtm}RsXN0H}-%u~wLw4n%IJK%oDHbHa5 zZ6{&fnD(5TBaDD^x;;;guHc5^`qYUpRM(OEJU^?gxgk=TrQAb8r0 zns0sdNiXQ~DAVZhq8o{T_MGWCaTkoW0papmdEpWq(>A|!d9)?vWy4X1*PiKkMs+;;u+%GzSJR@P_iQ7?wvF5^x}=8{y6J(ig9 zLfLHF#U@^^qc`)mzGqkRorgXDL?~d|JBQRkdX^I_J~y?<^O}u9eauBN>W`86fI@ja zwsK~69t$S|#dOHKa6!IwFtxH@&r(weBi?FJ_dxhw5T(pB-t=OeD$;OQ8sRPLfpulD zG_y4J2%~g^G1w_>rlfQOe%0-SV`Mt*9=>&;|2Cr?9C1C#6tSB zreG$FRD_E?JL+gJuct|GJ2Lf7WC{MW8Sucy%JwK8a0R-M@^-lkgMFEvepx>^jGMj) zx^@_nBToey2!8_}s3BM^NE&aJr0J3IQj+8(XV0C49o1??vrF4%$tq|jS~k?zh1QH+ zYGsDqxZ4x~8fs*UwP<4W3m5Erf?tv{y;327F~#W*$yUxDmXCjOIQN&lJwlkIKgM5n3RAvsgFR{tpPDw5> zl~AaTg4mqsNW37TC1l_Oc`$q`O)~cKe3ezED+l?OAsGw%Zp1fL!K1uc?DK9m72QQa zWYrEAHz|0VwGgWyZQ#yHswie%*Un{#9;N9*K8G{~6z@=akXk?SkqOLE>dTebix5ys zou^=LZjIJQ=Yq0!NmmhOqp~xyOJr}ZB8|6=&d=G+HF5rbReSQ}^o(7qy&QCtI_#wR zirC#NK0+Yo`n`z)aU zgp^e%q*n;-u%C3*V~X~K1p|p{U=Nks4&$?9M`2A$cCuoa|Ve5^1V^Z zPq$Ts4WpI4m4vs3Y^1-E(3-?wQPQuH@M)thfi=QZRQ5?;SU!@!-KLrwoCVTKltS@i z2+bEo8tiA(Jjfu)Y=SJnQloJ?OpK@9C8LE5Q)m0qU;3SZ!=vgHm)a+32pk!AP>Qhn zNz$Bl&19!)Zp710bxz#8DT-#(iJqc~uec;!$`g&LYn_r8;sB+3If2xr>WQj}gF?^A z7Cn{dGO$QEm>8IKO~r&RZBuw~;pju9nF@ZqpsF934B>V00|!(Cjk;Y<~c@^a9H-H;Gj2K`4+mztx&Hcaxen_jcB_xm{=)CU6s)wj_7o7E7iS@G7sW($fXn z=(FR@5WlLM%urT?_mZm%2^Fqk(B`drJkx1 zO#+4XsnHU(np#u-aF!GfhtEd3tH!GC3khZYcT9uGjvV^IiVkCLbMuOY0x?*?H~l;z TtTCb diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 0e9f930bc60..a9c72182d11 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -143,7 +143,7 @@ if ( !confirm( breedingid ? _("This record cannot be transferred to the advanced editor. Continue?") : _("Any changes will not be saved. Continue?") ) ) return false; - Cookies.set( 'catalogue_editor_[% logged_in_user.borrowernumber | html %]', 'advanced', { expires: 365, path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" } ); + Cookies.set( 'catalogue_editor_[% logged_in_user.borrowernumber | html %]', 'advanced', { expires: 365, path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" } ); var biblionumber = [% biblionumber || "null" | html %]; @@ -512,11 +512,11 @@ function PopupMARCFieldDoc(field) { function toggleMARCdocLinks(flag){ if( flag === true ){ $(".marcdocs").show(); - Cookies.set("marcdocs_[% borrowernumber | html %]",'show', { path: "/", expires: 365, sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" }); + Cookies.set("marcdocs_[% borrowernumber | html %]",'show', { path: "/", expires: 365, sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" }); $("#marcDocsSelect i").addClass('fa-check-square').removeClass('fa-square'); } else { $(".marcdocs").hide(); - Cookies.set("marcdocs_[% borrowernumber | html %]",'hide', { path: "/", expires: 365, sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" }); + Cookies.set("marcdocs_[% borrowernumber | html %]",'hide', { path: "/", expires: 365, sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" }); $("#marcDocsSelect i").removeClass('fa-check-square').addClass('fa-square'); } } @@ -525,12 +525,12 @@ function PopupMARCFieldDoc(field) { if( flag === true ){ $(".tagnum").show(); $(".subfieldcode").show(); - Cookies.set("marctags_[% borrowernumber | html %]",'show', { path: "/", expires: 365, sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" }); + Cookies.set("marctags_[% borrowernumber | html %]",'show', { path: "/", expires: 365, sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" }); $("#marcTagsSelect i").addClass('fa-check-square').removeClass('fa-square'); } else { $(".tagnum").hide(); $(".subfieldcode").hide(); - Cookies.set("marctags_[% borrowernumber | html %]",'hide', { path: "/", expires: 365, sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" }); + Cookies.set("marctags_[% borrowernumber | html %]",'hide', { path: "/", expires: 365, sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" }); $("#marcTagsSelect i").removeClass('fa-check-square').addClass('fa-square'); } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index 12bb2f5c7e9..9d4022fc19f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -295,7 +295,7 @@ }); $("#useadvanced").click(function(){ - Cookies.set( "catalogue_editor_[% logged_in_user.borrowernumber | html %]", "advanced", { expires: 365, path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" } ); + Cookies.set( "catalogue_editor_[% logged_in_user.borrowernumber | html %]", "advanced", { expires: 365, path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" } ); return true; }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt index 369b9fd4362..0a4eea15178 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt @@ -236,7 +236,7 @@ }); $("#useadvanced").click(function(){ - Cookies.set( "catalogue_editor_[% logged_in_user.borrowernumber | html %]", "advanced", { expires: 365, path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" } ); + Cookies.set( "catalogue_editor_[% logged_in_user.borrowernumber | html %]", "advanced", { expires: 365, path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" } ); return true; }); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt index 466274ef4db..b47d784e830 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt @@ -235,7 +235,7 @@ function SearchToHold(club_id) { var date = new Date(); date.setTime(date.getTime() + (10 * 60 * 1000)); - Cookies.set("holdforclub", club_id, { path: "/", expires: date, sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" }); + Cookies.set("holdforclub", club_id, { path: "/", expires: date, sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" }); location.href="/cgi-bin/koha/catalogue/search.pl"; } diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt index 6d3bb40eea7..34ac944e793 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt @@ -524,18 +524,18 @@ $(document).ready(function() { } }); form_serialized = $(this).serialize(); - Cookies.set("form_serialized", JSON.stringify( form_serialized ), { path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" }); + Cookies.set("form_serialized", JSON.stringify( form_serialized ), { path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" }); form_serialized_limits = [ $('#language-limit').val(), $('#branchloop').val(), $('#subtype_audience').val(), $('#subtype_content').val(), $('#subtype_format').val(), $('#subtype_additional').val(), $('#locloop').val() ]; - Cookies.set("form_serialized_limits", JSON.stringify( form_serialized_limits ),{ path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" }); + Cookies.set("form_serialized_limits", JSON.stringify( form_serialized_limits ),{ path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" }); [% IF ( expanded_options ) %] - Cookies.set("search_path_code", 'exs', { path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" }); + Cookies.set("search_path_code", 'exs', { path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" }); [% ELSE %] - Cookies.set("search_path_code", 'ads', { path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') %]" }); + Cookies.set("search_path_code", 'ads', { path: '/', sameSite: "[% Koha.Preference('SameSiteSessionCookie') | html %]" }); [% END %] }); -- 2.20.1