From 59757c1f5b7de423241f91ef8c95822183786d00 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 25 Oct 2018 12:55:43 -0300 Subject: [PATCH] Bug 21669: Do not html filter TT assignement statements Why? Because we must filter the variables when we display them. If we escape them on assignement, they will be double escaped: [% XXX = "pouet" | html %] [% XXX | html %] => <span>pouet</span> Also it will bring trouble if we are assigning a structure (see bug 21663 for instance). Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- .../prog/en/includes/branch-selector.inc | 4 ++-- .../intranet-tmpl/prog/en/modules/about.tt | 4 ++-- .../prog/en/modules/acqui/basket.tt | 16 +++++++-------- .../prog/en/modules/acqui/booksellers.tt | 2 +- .../prog/en/modules/acqui/invoice.tt | 8 ++++---- .../prog/en/modules/acqui/neworderempty.tt | 6 +++--- .../en/modules/admin/authorised_values.tt | 4 ++-- .../prog/en/modules/admin/categories.tt | 4 ++-- .../prog/en/modules/admin/matching-rules.tt | 2 +- .../en/modules/admin/patron-attr-types.tt | 4 ++-- .../prog/en/modules/catalogue/detail.tt | 4 ++-- .../prog/en/modules/catalogue/itemsearch.tt | 4 ++-- .../prog/en/modules/catalogue/results.tt | 2 +- .../prog/en/modules/cataloguing/merge.tt | 10 +++++----- .../prog/en/modules/circ/circulation.tt | 4 ++-- .../circ/circulation_batch_checkouts.tt | 4 ++-- .../prog/en/modules/ill/ill-requests.tt | 2 +- .../prog/en/modules/members/discharge.tt | 4 ++-- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/members/members-update.tt | 2 +- .../en/modules/reports/cash_register_stats.tt | 4 ++-- .../modules/reports/guided_reports_start.tt | 2 +- .../prog/en/modules/tools/letter.tt | 2 +- .../prog/en/modules/tools/modborrowers.tt | 2 +- .../bootstrap/en/includes/item-status.inc | 6 +++--- .../bootstrap/en/includes/opac-topissues.inc | 2 +- .../bootstrap/en/modules/opac-detail.tt | 20 +++++++++---------- .../bootstrap/en/modules/opac-illrequests.tt | 4 ++-- .../bootstrap/en/modules/opac-opensearch.tt | 2 +- .../en/modules/opac-readingrecord.tt | 10 +++++----- .../bootstrap/en/modules/opac-results.tt | 6 +++--- .../bootstrap/en/modules/opac-shelves.tt | 4 ++-- .../en/modules/opac-showreviews-rss.tt | 2 +- .../bootstrap/en/modules/opac-showreviews.tt | 2 +- .../bootstrap/en/modules/opac-user.tt | 8 ++++---- 35 files changed, 84 insertions(+), 84 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc index 6aea85b547..f05fa91f6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/branch-selector.inc @@ -1,8 +1,8 @@ [%# First check to see if we have anything selected, otherwise we select all %] -[% selectall = 1 | html %] +[% selectall = 1 %] [% FOREACH branch IN branches %] [% IF branch.selected %] - [% selectall = 0 | html %] + [% selectall = 0 %] [% END %] [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index d8d1b8862f..a7758480b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -117,8 +117,8 @@ [% current_date_and_time | $KohaDates with_hours => 1 | html %] - [% timezone_config_class = (time_zone.config_invalid) ? 'status_warn' : '' | html %] - [% timezone_env_class = (time_zone.env_invalid) ? 'status_warn' : '' | html %] + [% timezone_config_class = (time_zone.config_invalid) ? 'status_warn' : '' %] + [% timezone_env_class = (time_zone.env_invalid) ? 'status_warn' : '' %] Time zone: Used: [% time_zone.actual | html %] [% IF time_zone.actual_bad_tz_fallback %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index ab91cb2c70..9be0d3a070 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -464,13 +464,13 @@ Add vendor note [% END %] [% IF (books_loo.transferred_from) %] - [% basket = books_loo.transferred_from.basket | html %] - [% bookseller = books_loo.transferred_from.bookseller | html %] - [% timestamp = books_loo.transferred_from.timestamp | html %] + [% basket = books_loo.transferred_from.basket %] + [% bookseller = books_loo.transferred_from.bookseller %] + [% timestamp = books_loo.transferred_from.timestamp %]

Transferred from basket: [% basket.basketname | html %] ([% bookseller.name | html %]) - on + on [% timestamp | $KohaDates %]

@@ -582,13 +582,13 @@ [% END %]

[% IF order.transferred_to %] - [% basket = order.transferred_to.basket | html %] - [% bookseller = order.transferred_to.bookseller | html %] - [% timestamp = order.transferred_to.timestamp | html %] + [% basket = order.transferred_to.basket %] + [% bookseller = order.transferred_to.bookseller %] + [% timestamp = order.transferred_to.timestamp %]

Transferred to basket: [% basket.basketname | html %] ([% bookseller.name | html %]) - on + on [% timestamp | $KohaDates %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index f8d5d8b63b..c5da9f2f97 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -128,7 +128,7 @@ [% basket.creationdate | $KohaDates %] [% IF basket.basketgroup %] - [% basketgroup = basket.basketgroup | html %] + [% basketgroup = basket.basketgroup %] [% IF basketgroup.closed %] [% basketgroup.name | html %] (closed) [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index c66c94ba3b..281df73de9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -104,14 +104,14 @@ Encumber while invoice open   - [% total_adj = 0 | html %] + [% total_adj = 0 %] [% FOREACH adjustment IN adjustments %] - [% total_adj = total_adj + adjustment.adjustment | html %] + [% total_adj = total_adj + adjustment.adjustment %] [% adjustment.adjustment_id | html %] - [% reasons = AuthorisedValues.Get("ADJ_REASON") | html %] + [% reasons = AuthorisedValues.Get("ADJ_REASON") %] [% IF reasons.0 %] - [% reasons = AuthorisedValues.Get("ADJ_REASON") | html %] + [% reasons = AuthorisedValues.Get("ADJ_REASON") %] [% IF reasons.0 %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index ee4b764741..a9f0c63972 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -327,17 +327,17 @@ [% Budget_name | html %] [% ELSE %] - [% active_count = 0 | html %] + [% active_count = 0 %] [% IF !ordernumber %] [% FOREACH budget_loo IN budget_loop %] - [% active_count= active_count + budget_loo.b_active | html %] + [% active_count= active_count + budget_loo.b_active %] [% END %] [% END %] [% PROCESS norms_options selected_norm=selected_norm %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index 76c038f24f..0ad7467271 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -260,9 +260,9 @@ [% item.description | html %] [% IF ( item.branches && item.branches.size > 0 ) %] - [% branches_str = "" | html %] + [% branches_str = "" %] [% FOREACH branch IN item.branches %] - [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" | html %] + [% branches_str = branches_str _ " " _ branch.branchname _ "(" _ branch.branchcode _ ")" %] [% END %] [% IF item.branches.size > 1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 451c10526f..06f1df0d54 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -8,9 +8,9 @@ [% USE ColumnsSettings %] [% IF Koha.Preference('AmazonAssocTag') %] - [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') | html %] + [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') %] [% ELSE %] - [% AmazonAssocTag = '' | html %] + [% AmazonAssocTag = '' %] [% END %] [% ShowCourseReserves = 0 | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt index 05afac4f69..a7abe0f9f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt @@ -72,9 +72,9 @@ [% IF items_search_fields.size %] [% FOREACH field IN items_search_fields %] - [% marcfield = field.tagfield | html %] + [% marcfield = field.tagfield %] [% IF field.tagsubfield %] - [% marcfield = marcfield _ '$' _ field.tagsubfield | html %] + [% marcfield = marcfield _ '$' _ field.tagsubfield %] [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index ce5179f888..c49d8b3894 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -399,7 +399,7 @@ [% SEARCH_RESULT.XSLTResultsRecord | $raw %] [% ELSE %]

    [% SEARCH_RESULT.result_number | html %]. - [% biblionumber = SEARCH_RESULT.biblionumber | html %] + [% biblionumber = SEARCH_RESULT.biblionumber %] [% INCLUDE 'biblio-default-view.inc' %] [% IF ( SEARCH_RESULT.title ) %][% SEARCH_RESULT.title | html %][% ELSE %]No title[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt index d7d378a805..80c8cc573e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt @@ -46,12 +46,12 @@ div#result { margin-top: 1em; } Biblionumber [% FOREACH key IN report_header.keys.sort %] - [% tag = key.substr(0, 3) | html %] - [% code = key.substr(3, 1) | html %] + [% tag = key.substr(0, 3) %] + [% code = key.substr(3, 1) %] [% IF code == '@' %] - [% header = tag | html %] + [% header = tag %] [% ELSE %] - [% header = tag _ '$' _ code | html %] + [% header = tag _ '$' _ code %] [% END %] [% header | html %] [% END %] @@ -68,7 +68,7 @@ div#result { margin-top: 1em; } [% FOREACH key IN report_header.keys.sort %] - [% values = record.fields.$key | html %] + [% values = record.fields.$key %] [% IF values %] [% FOREACH value IN record.fields.$key %] [% value | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 2b273e047a..ee23e4e24d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -155,7 +155,7 @@ [% IF ( itemtype_notforloan ) %] Item type is normally not for loan. [% ELSIF ( item_notforloan ) %] - [% item_notforloan_lib = AuthorisedValues.GetByCode( authvalcode_notforloan, item_notforloan, 0 ) | html %] + [% item_notforloan_lib = AuthorisedValues.GetByCode( authvalcode_notforloan, item_notforloan, 0 ) %] Item is normally not for loan [% IF (item_notforloan_lib) %]([% item_notforloan_lib | html %])[% END %]. [% END %] [% IF CAN_user_circulate_force_checkout %] @@ -341,7 +341,7 @@ [% IF ( itemtype_notforloan ) %] Item type not for loan. [% ELSIF ( item_notforloan ) %] - [% item_notforloan_lib = AuthorisedValues.GetByCode( authvalcode_notforloan, item_notforloan, 0 ) | html %] + [% item_notforloan_lib = AuthorisedValues.GetByCode( authvalcode_notforloan, item_notforloan, 0 ) %] Item not for loan [% IF (item_notforloan_lib) %]([% item_notforloan_lib | html %])[% END %]. [% END %]

    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index eada7334a2..566dfdffaa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -152,7 +152,7 @@ [% IF checkout_info.itemtype_notforloan %]
  • Item type is normally not for loan.
    • [% ELSIF checkout_info.item_notforloan %] - [% item_notforloan_lib = AuthorisedValues.GetByCode( authvalcode_notforloan, checkout_info.item_notforloan, 0 ) | html %] + [% item_notforloan_lib = AuthorisedValues.GetByCode( authvalcode_notforloan, checkout_info.item_notforloan, 0 ) %]
  • Item is normally not for loan [% IF item_notforloan_lib %]([% item_notforloan_lib | html %])[% END %].
    • [% END %] [% END %] @@ -208,7 +208,7 @@ [% IF checkout_info.itemtype_notforloan %]
  • Item type not for loan.
    • [% ELSIF checkout_info.item_notforloan %] - [% item_notforloan_lib = AuthorisedValues.GetByCode( checkout_info.authvalcode_notforloan, checkout_info.item_notforloan, 0 ) | html %] + [% item_notforloan_lib = AuthorisedValues.GetByCode( checkout_info.authvalcode_notforloan, checkout_info.item_notforloan, 0 ) %]
  • Item not for loan [% IF checkout_info.item_notforloan_lib %]([% checkout_info.item_notforloan_lib | html %])[% END %].
    • [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index 584616263d..7250f5d697 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -427,7 +427,7 @@
  • - [% stat = request.status | html %] + [% stat = request.status %] [% request.capabilities.$stat.name | html %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt index 694f4942ac..d3d636d022 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt @@ -56,8 +56,8 @@ [% FOR d IN validated_discharges %] - [% d.needed | $KohaDates with_hours = 1 | html %] - [% d.validated | $KohaDates with_hours = 1 | html %] + [% d.needed | $KohaDates with_hours = 1 %] + [% d.validated | $KohaDates with_hours = 1 %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index e45429532a..49ddce8935 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1304,7 +1304,7 @@ $(document).ready(function () { $("#entryform,#saverecord").hide(); - [% q_add_f = Koha.Preference('PatronQuickAddFields').split('\|') | html %] + [% q_add_f = Koha.Preference('PatronQuickAddFields').split('\|') %] var qaddfields = [[% FOREACH field IN q_add_f.unique %]"[% field | html %]",[% END %]]; var skipped_fields = ["contactname","contactfirstname","relationship"]; //Guarantor form is pulled as a whole, ignore individual fields $("#entryform label").each(function () { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt index 687afdee93..32677d46fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt @@ -99,7 +99,7 @@
    [% FOREACH pm IN PendingModifications %] [% SET borrowernumber = pm.borrowernumber %] -

    [% borrowers.$borrowernumber.surname | html %][% IF ( borrowers.$borrowernumber.firstname ) %], [% borrowers.$borrowernumber.firstname | html %][% END %] - [% Categories.GetName( borrowers.$borrowernumber.categorycode ) | html %] ([% Branches.GetName( borrowers.$borrowernumber.branchcode ) | html %]) ([% borrowers.$borrowernumber.cardnumber | html %]) - Requested on [% pm.timestamp | $KohaDates with_hours = 1 | html %]

    +

    [% borrowers.$borrowernumber.surname | html %][% IF ( borrowers.$borrowernumber.firstname ) %], [% borrowers.$borrowernumber.firstname | html %][% END %] - [% Categories.GetName( borrowers.$borrowernumber.categorycode ) | html %] ([% Branches.GetName( borrowers.$borrowernumber.branchcode ) | html %]) ([% borrowers.$borrowernumber.cardnumber | html %]) - Requested on [% pm.timestamp | $KohaDates with_hours = 1 %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt index 018cdee0e4..f0439bc99c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt @@ -122,7 +122,7 @@ [% END %] [% FOREACH manualinv IN manualinv_types %] - [% value_manualinv = manualinv.authorised_value|truncate(5, '') | html %] + [% value_manualinv = manualinv.authorised_value|truncate(5, '') %] [% IF transaction_type == value_manualinv %] [% ELSE %] @@ -218,7 +218,7 @@ New card [% ELSE %] [% FOREACH manualinv IN manualinv_types %] - [% value_manualinv = manualinv.authorised_value|truncate(5, '') | html %] + [% value_manualinv = manualinv.authorised_value|truncate(5, '') %] [% IF loopresul.accounttype == value_manualinv %] [% manualinv.authorised_value | html %] [% LAST %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index f432cf00b0..4aaa49ef64 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -743,7 +743,7 @@ canned reports and writing custom SQL reports.

    [% FOREACH result IN results %] [% FOREACH cells IN result.cells %] - [% place = loop.index | html %] + [% place = loop.index %] [% IF header_row.$place.cell == 'itemnumber' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index 56cca283ed..149385e8e0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -91,7 +91,7 @@ [% FOREACH lette IN letter %] - [% can_edit = lette.branchcode || !independant_branch | html %] + [% can_edit = lette.branchcode || !independant_branch %] [% IF lette.branchname %][% lette.branchname | html %][% ELSE %](All libraries)[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt index 94e80506e7..a79974acfc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -69,7 +69,7 @@ [% END %] [% IF ( op == 'show') && (!borrowers) && (!notfoundcardnumbers) # Alert if no patrons given%] - [% op = 'noshow' # Change op to prevent display in code below | html %] + [% op = 'noshow' # Change op to prevent display in code below %]

    Batch patrons modification

    No patron card numbers given.

    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc index 55474da7a8..99bdeed344 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc @@ -8,7 +8,7 @@ [% IF ( item.itemlost ) %] [% SET itemavailable = 0 %] - [% av_lib_include = AuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) | html %] + [% av_lib_include = AuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) %] [% IF ( av_lib_include ) %] [% av_lib_include | html %] [% ELSE %] @@ -53,7 +53,7 @@ [% IF ( item.withdrawn ) %] [% SET itemavailable = 0 %] - [% av_lib_include = AuthorisedValues.GetByCode( 'WITHDRAWN', item.withdrawn, 1 ) | html %] + [% av_lib_include = AuthorisedValues.GetByCode( 'WITHDRAWN', item.withdrawn, 1 ) %] [% IF av_lib_include %] [% av_lib_include | html %] [% ELSE %] @@ -76,7 +76,7 @@ [% IF ( item.damaged ) %] [% SET itemavailable = 0 %] - [% av_lib_include = AuthorisedValues.GetByCode( 'DAMAGED', item.damaged, 1 ) | html %] + [% av_lib_include = AuthorisedValues.GetByCode( 'DAMAGED', item.damaged, 1 ) %] [% IF av_lib_include %] [% av_lib_include | html %] [% ELSE %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc index 5bf505b7d2..6f08f1cd2d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-topissues.inc @@ -25,7 +25,7 @@
    • [% END %] - [% AdvancedSearchTypes = Koha.Preference('AdvancedSearchTypes').split('\|') | html %] + [% AdvancedSearchTypes = Koha.Preference('AdvancedSearchTypes').split('\|') %] [% IF AdvancedSearchTypes.grep('^itemtypes$').size %]
  • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index c451d8d60d..f9a680de74 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -9,18 +9,18 @@ [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsShowOnDetail ) %] [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnDetail ) %] [% IF Koha.Preference('AmazonAssocTag') %] - [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') | html %] + [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') %] [% ELSE %] - [% AmazonAssocTag = '' | html %] + [% AmazonAssocTag = '' %] [% END %] -[% ShowCourseReservesHeader = 0 | html %] +[% ShowCourseReservesHeader = 0 %] [% IF Koha.Preference( 'UseCourseReserves' ) == 1 %] [% FOREACH ITEM_RESULT IN itemloop %] [% IF ITEM_RESULT.course_reserves %] [% FOREACH r IN ITEM_RESULT.course_reserves %] [% IF r.course.enabled == 'yes' %] - [% ShowCourseReservesHeader = 1 | html %] + [% ShowCourseReservesHeader = 1 %] [% END %] [% END %] [% END %] @@ -78,13 +78,13 @@
    [% END %] [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %] - [% coce_id = normalized_ean || normalized_isbn | html %] + [% coce_id = normalized_ean || normalized_isbn %]
    [% END %] [% IF OpenLibraryCovers %]
    [% END %] - [% bt_id = ( normalized_upc || normalized_isbn ) | html %] + [% bt_id = ( normalized_upc || normalized_isbn ) %] [% IF ( BakerTaylorEnabled && bt_id ) %] [% IF BakerTaylorBookstoreURL %] [% IF ( OPACURLOpenInNewWindow ) %] @@ -168,7 +168,7 @@ [% END # /OPACPopupAuthorsSearch %] [% FOREACH MARCAUTHOR IN MARCAUTHORS %] - [% authorsloop = loop | html %] + [% authorsloop = loop %] [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %] [% MARCAUTHOR_SUBFIELDS_LOO.separator | html %] [% IF Koha.Preference( 'OPACPopupAuthorsSearch' ) == 1 %] @@ -268,7 +268,7 @@ All [% FOREACH MARCSUBJCT IN MARCSUBJCTS %] - [% subjectsloop = loop | html %] + [% subjectsloop = loop %] [% IF MARCSUBJCT.authoritylink %]
      [% ELSE %] @@ -293,7 +293,7 @@ [% END # /OPACPopupAuthorsSearch%] [% FOREACH MARCSUBJCT IN MARCSUBJCTS %] - [% subjectsloop = loop | html %] + [% subjectsloop = loop %] [% FOREACH SUBFIELD IN MARCSUBJCT.MARCSUBJECT_SUBFIELDS_LOOP %] [% SUBFIELD.separator | html %] [% IF Koha.Preference( 'OPACPopupAuthorsSearch' ) == 1 %] @@ -1252,7 +1252,7 @@ [% IF Branches.GetURL( ITEM_RESULT.homebranch ) %] - [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) | html %] + [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) %] [% IF ( home_branch_url ) %] [% Branches.GetName( ITEM_RESULT.homebranch ) | html %] [% ELSE %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt index 8091efa8a7..f53308d64c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt @@ -125,7 +125,7 @@ [% FOREACH request IN requests %] - [% status = request.status | html %] + [% status = request.status %] [% request.id | html %] @@ -149,7 +149,7 @@ [% ELSIF method == 'view' %]

      View interlibrary loan request

      [% INCLUDE messages %] - [% status = request.status | html %] + [% status = request.status %]
      Details from library diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt index c577c50aa4..242405c5b4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt @@ -43,7 +43,7 @@ [% END %][% END %][% END %] -[% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %] +[% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] [% IF ( BakerTaylorEnabled ) %][% IF bt_id %]See Baker & Taylor[% END %][% END %]

      [% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author | html %]. [% END %] [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place | html %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode | html %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt index f571ebf633..415737cbba 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -12,9 +12,9 @@ [% INCLUDE 'masthead.inc' %] [% IF Koha.Preference('AmazonAssocTag') %] - [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') | html %] + [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') %] [% ELSE %] - [% AmazonAssocTag = '' | html %] + [% AmazonAssocTag = '' %] [% END %]

      @@ -88,8 +88,8 @@ [% FOREACH issue IN READING_RECORD %] - [% IF issue.onsite_checkout %][% issuetype = 'onsite_checkout' | html %] - [% ELSE %][% issuetype = 'standard_checkout' | html %] + [% IF issue.onsite_checkout %][% issuetype = 'onsite_checkout' %] + [% ELSE %][% issuetype = 'standard_checkout' %] [% END %] [% issuetype | html %] @@ -111,7 +111,7 @@ [% END %] [% IF BakerTaylorEnabled %] - [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) | html %] + [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) %] [% IF ( bt_id ) %] See Baker & Taylor [% ELSE %] 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 1d3742d839..2b5588f2bd 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -254,7 +254,7 @@ [% END %] [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %] - [% coce_id = SEARCH_RESULT.normalized_ean || SEARCH_RESULT.normalized_isbn | html %] + [% coce_id = SEARCH_RESULT.normalized_ean || SEARCH_RESULT.normalized_isbn %] [% IF ( coce_id ) %] [% ELSE %] @@ -271,7 +271,7 @@ [% END %] [% IF ( BakerTaylorEnabled && !BakerTaylorBookstoreURL ) %] - [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %] + [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] [% IF ( bt_id ) %] See Baker & Taylor [% ELSE %] @@ -281,7 +281,7 @@ [% IF ( BakerTaylorEnabled && BakerTaylorBookstoreURL ) %] - [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %] + [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] [% IF ( bt_id ) %] See Baker & Taylor diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index dae56ede38..fb2112ecb8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -328,7 +328,7 @@ [% END %] [% IF ( Koha.Preference('Coce') && Koha.Preference('CoceProviders') ) %] - [% coce_id = itemsloo.normalized_ean || itemsloo.normalized_isbn | html %] + [% coce_id = itemsloo.normalized_ean || itemsloo.normalized_isbn %] [% IF ( coce_id ) %] [% ELSE %] @@ -347,7 +347,7 @@ [% IF ( BakerTaylorEnabled ) %] - [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) | html %] + [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) %] [% IF ( bt_id ) %] See Baker & Taylor [% ELSE %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt index 19900ab7e5..8d6a8cf3e8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt @@ -16,7 +16,7 @@ [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %] [% END %][% END %][% END %] -[% bt_id = ( review.normalized_upc || review.normalized_isbn ) | html %] +[% bt_id = ( review.normalized_upc || review.normalized_isbn ) %] [% IF ( BakerTaylorEnabled && bt_id ) %]See Baker & Taylor[% END %] [% IF ( review.author ) %]

      By [% review.author | html %].

      [% END %]

      [% IF ( review.place ) %][% review.place | html %] [% END %][% IF ( review.publishercode ) %][% review.publishercode | html %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt index e33f098a22..c915cd3743 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt @@ -137,7 +137,7 @@ [% END %] [% END %] - [% bt_id = ( review.normalized_upc || review.normalized_isbn ) | html %] + [% bt_id = ( review.normalized_upc || review.normalized_isbn ) %] [% IF ( BakerTaylorEnabled ) %] [% IF ( bt_id ) %] See Baker & Taylor diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 9af74ba466..d42aef800a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -18,9 +18,9 @@ [% INCLUDE 'masthead.inc' %] [% IF Koha.Preference('AmazonAssocTag') %] - [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') | html %] + [% AmazonAssocTag = '?tag=' _ Koha.Preference('AmazonAssocTag') %] [% ELSE %] - [% AmazonAssocTag = '' | html %] + [% AmazonAssocTag = '' %] [% END %]

      @@ -228,7 +228,7 @@ [% END %] [% IF ( BakerTaylorEnabled ) %] - [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) | html %] + [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) %] [% IF ( bt_id ) %] See Baker & Taylor [% ELSE %] @@ -503,7 +503,7 @@ [% END %] [% IF ( BakerTaylorEnabled ) %] - [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) | html %] + [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) %] [% IF ( bt_id ) %] See Baker & Taylor [% ELSE %] -- 2.39.5