From 12b1530799bb7b2a41f174ca578932759644a96a Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Wed, 22 Oct 2014 17:38:01 +0200 Subject: [PATCH] [PASSED QA] Bug 13129 - HTML and JS escapes missing in unimarc_field_4XX.tt This patch adds JS and HTML espaces are it is missing. Replaces calls to url filter by uri filter, url filter does not espace enough characters: http://template-toolkit.org/docs/manual/Filters.html#section_url. Also corrects the fact the code: resul.size => resul.item('size'). Old code returns the size of the loop instead of the value of "size" field. Test plan : - Use the plugin unimarc_field_4XX - Perform a search with a ? or & => Search works - Perform a search that returns a record with a double quote in title - Choose this record => Plugin works - Check the results displays well the value of biblioitems.size Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Passes tests and QA script, I fixed some tabs. Tested in a UNIMARC installation. --- .../cataloguing/value_builder/unimarc_field_4XX.tt | 64 +++++++++++----------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt index 67dcb3e..ec604fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt @@ -25,46 +25,46 @@ var subfield = subfields[i+1]; if(code.value == '9'){ - subfield.value = "[% subfield_value_9 %]"; + subfield.value = "[% subfield_value_9 |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == '0'){ - subfield.value = "[% subfield_value_0 %]"; + subfield.value = "[% subfield_value_0 |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == 'a'){ - subfield.value = "[% subfield_value_a %]"; + subfield.value = "[% subfield_value_a |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == 'c'){ - subfield.value = "[% subfield_value_c %]"; + subfield.value = "[% subfield_value_c |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == 'd'){ - subfield.value = "[% subfield_value_d %]"; + subfield.value = "[% subfield_value_d |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == 'e'){ - subfield.value = "[% subfield_value_e %]"; + subfield.value = "[% subfield_value_e |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == 'h'){ - subfield.value = "[% subfield_value_h %]"; + subfield.value = "[% subfield_value_h |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == 'i'){ - subfield.value = "[% subfield_value_i %]"; + subfield.value = "[% subfield_value_i |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == 'p'){ - subfield.value = "[% subfield_value_p %]"; + subfield.value = "[% subfield_value_p |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == 't'){ - subfield.value = "[% subfield_value_t %]"; + subfield.value = "[% subfield_value_t |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == 'u'){ - subfield.value = "[% subfield_value_u %]"; + subfield.value = "[% subfield_value_u |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == 'v'){ - subfield.value = "[% subfield_value_v %]"; + subfield.value = "[% subfield_value_v |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == 'x'){ - subfield.value = "[% subfield_value_x %]"; + subfield.value = "[% subfield_value_x |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } if(code.value == 'y'){ - subfield.value = "[% subfield_value_y %]"; + subfield.value = "[% subfield_value_y |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]"; } } } @@ -121,9 +121,9 @@ [% FOREACH itypeloo IN itypeloop %] [% IF ( itypeloo.selected ) %] - + [% ELSE %] - + [% END %] [% END %] @@ -140,14 +140,14 @@

Search results

-

[% IF ( displayprev ) %] << Previous[% END %] +

[% IF ( displayprev ) %] << Previous[% END %] [% FOREACH number IN numbers %] [% IF ( number.highlight ) %] [% number.number %] - [% ELSE %] [% number.number %] + [% ELSE %] [% number.number %] [% END %] [% END %] [% IF ( displaynext ) %] - Next>> + Next>> [% END %]

[% IF ( total ) %]Results [% from %] to [% to %] of [% total %] @@ -167,24 +167,24 @@ [% IF ( resul.even ) %] [% ELSE %][% END %] [% IF ( resul.MARC_ON ) %] - [% resul.title |html %] + [% resul.title |html %] [% ELSE %] - [% resul.title |html %] [% END %] -

[% resul.author %] - [% IF ( resul.publishercode ) %]- [% resul.publishercode %][% END %] - [% IF ( resul.place ) %] ; [% resul.place %][% END %] - [% IF ( resul.pages ) %] - [% resul.pages %][% END %] - [% IF ( resul.notes ) %] : [% resul.notes %][% END %] - [% IF ( resul.size ) %] ; [% resul.size %][% END %] + [% resul.title |html %] [% END %] +

[% resul.author |html %] + [% IF ( resul.publishercode ) %]- [% resul.publishercode |html %][% END %] + [% IF ( resul.place ) %] ; [% resul.place |html %][% END %] + [% IF ( resul.pages ) %] - [% resul.pages |html %][% END %] + [% IF ( resul.notes ) %] : [% resul.notes |html %][% END %] + [% IF ( resul.item('size') ) %] ; [% resul.item('size') |html %][% END %]

[% IF ( resul.even ) %] [% ELSE %][% END %] - [% resul.totitem %] + [% resul.totitem |html %] [% IF ( resul.even ) %] [% ELSE %][% END %] - [% resul.CN %] + [% resul.CN |html %] [% IF ( resul.biblionumber ) %] @@ -201,7 +201,7 @@

[% IF ( displayprev ) %] - + << Previous [% END %] @@ -212,14 +212,14 @@ [% number.number %] [% ELSE %] - + [% number.number %] [% END %] [% END %] [% IF ( displaynext ) %] - + Next>> [% END %] -- 1.9.1