From 68d5e2973727b28a0eed803c33cc179c045a6427 Mon Sep 17 00:00:00 2001 From: David Cook Date: Wed, 20 Nov 2024 01:09:00 +0000 Subject: [PATCH] Bug 31165: Scrub "Public note" field for Course Reserves When displaying the "Public note" for Course Reserves, we scrub the HTML using the "note" scrubber type. Test plan: 0. Apply the patch 1. Go to http://localhost:8081/cgi-bin/koha/course_reserves/course-reserves.pl 2. Click "New course" 3. Fill in required fields 4. In staff note and public note add the following:

Hello!

5. Click Save 6. Click "Add reserves" 7. Add "39999000001310" to Item barcode 8. Click "Submit" 9. Fill in all required fields 10. Add the following for Staff note and Public note:

Item!

11. Click "Save" 12. Go back to your course reserve 13. Note the HTML is scrubbed on "Public note" 14. Go to http://localhost:8081/cgi-bin/koha/course_reserves/course-reserves.pl 15. Note the HTML is scrubbed on "Public note" 16. Go to http://localhost:8080/cgi-bin/koha/opac-course-reserves.pl 17. Note the HTML is scrubbed on "Notes" 18. Click on your course reserves 19. Note the HTML is scrubbed on "Notes" Signed-off-by: Brendan Lawlor --- .../prog/en/modules/course_reserves/course-details.tt | 7 ++++--- .../prog/en/modules/course_reserves/course-reserves.tt | 3 ++- .../opac-tmpl/bootstrap/en/modules/opac-course-details.tt | 5 +++-- .../opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index e2d3fb96557..b0508d8ece2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -6,6 +6,7 @@ [% USE ItemTypes %] [% USE Branches %] [% USE TablesSettings %] +[% USE HtmlScrubber %] [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -99,7 +100,7 @@
  • Staff note [% course.staff_note | html %]
  • -
  • Public note [% course.public_note | $raw %]
  • +
  • Public note [% course.public_note | scrub_html type => 'note' | $raw %]
  • Student count [% course.students_count | html %]
  • Status [% IF course.enabled == 'yes' %]Active[% ELSE %]Inactive[% END %]
  • @@ -265,9 +266,9 @@ [% IF (cr.public_note) %] - [% cr.public_note | $raw %] + [% cr.public_note | scrub_html type => 'note' | $raw %] [% ELSIF (cr.item.itemnotes) %] - [% cr.item.itemnotes | $raw %] + [% cr.item.itemnotes | scrub_html type => 'note' | $raw %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt index 1725a18520c..2d1dd5014ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt @@ -3,6 +3,7 @@ [% USE Asset %] [% USE AuthorisedValues %] [% USE TablesSettings %] +[% USE HtmlScrubber %] [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -74,7 +75,7 @@ [% END %] [% c.staff_note | html %] - [% c.public_note | $raw %] + [% c.public_note | scrub_html type => 'note' | $raw %] [% c.students_count | html %] [% IF c.enabled == 'yes' %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt index 053d647a487..ac1d73646ca 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt @@ -6,6 +6,7 @@ [% USE ItemTypes %] [% USE Branches %] [% USE TablesSettings %] +[% USE HtmlScrubber %] [% PROCESS 'i18n.inc' %] [% PROCESS 'html_helpers.inc' %] [% INCLUDE 'doc-head-open.inc' %] @@ -54,7 +55,7 @@ [% END %] - [% IF ( course.public_note ) %]
  • Notes: [% course.public_note | $raw %]
  • [% END %] + [% IF ( course.public_note ) %]
  • Notes: [% course.public_note | scrub_html type => 'note' | $raw %]
  • [% END %] @@ -99,7 +100,7 @@ [% cr.issue.date_due | $KohaDates as_due_date => 1 %] [% IF ( cr.public_note ) %] - [% cr.public_note | $raw %] + [% cr.public_note | scrub_html type => 'note' | $raw %] [% ELSIF ( cr.item.itemnotes ) %] [% cr.item.itemnotes | $raw %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt index 0059a7b0a44..d9144c02faf 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt @@ -6,6 +6,7 @@ [% PROCESS 'i18n.inc' %] [% PROCESS 'html_helpers.inc' %] [% INCLUDE 'doc-head-open.inc' %] +[% USE HtmlScrubber %] [% FILTER collapse %] [% t("Course reserves") | html %] @@ -63,7 +64,7 @@ > [% END %] </td> - <td>[% c.public_note | $raw %]</td> + <td>[% c.public_note | scrub_html type => 'note' | $raw %]</td> <td></td> </tr> [% END %] -- 2.34.1