From b04df7d606afa7ec7a43c788dcfcd06e595ccabd Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 1 Oct 2018 14:18:15 -0300
Subject: [PATCH] Bug 17602: Add missing html filters

RM update: Remove accidental tabs from updatedatabase.pl

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 installer/data/mysql/updatedatabase.pl                 |  8 ++++----
 .../opac-tmpl/bootstrap/en/includes/opac-bottom.inc    |  2 +-
 .../bootstrap/en/modules/opac-recordedbooks-search.tt  | 10 +++++-----
 .../opac-tmpl/bootstrap/en/modules/opac-results.tt     |  2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt  |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 4c4e4d262e..4c5fcd1314 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -16465,10 +16465,10 @@ if( CheckVersion( $DBversion ) ) {
 $DBversion = '18.06.00.034';
 if( CheckVersion( $DBversion ) ) {
     $dbh->do(q|
-	INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
-	VALUES ('RecordedBooksClientSecret','','30','Client key for RecordedBooks integration','YesNo'),
-	       ('RecordedBooksLibraryID','','','Library ID for RecordedBooks integration','Integer'),
-	       ('RecordedBooksDomain','','','RecordedBooks domain','Free');
+        INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type)
+        VALUES ('RecordedBooksClientSecret','','30','Client key for RecordedBooks integration','YesNo'),
+               ('RecordedBooksLibraryID','','','Library ID for RecordedBooks integration','Integer'),
+               ('RecordedBooksDomain','','','RecordedBooks domain','Free');
     |);
     SetVersion( $DBversion );
     print "Upgrade to $DBversion done (Bug 17602 - Integrate support for OneClickdigital/Recorded Books API)\n";
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 106e6dd0ff..ab7eb2c306 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -272,7 +272,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
 [% END %]
 
 [% IF (RecordedBooksEnabled) %]
-  var SPINNER_THROBBER = "[% interface %]/lib/jquery/plugins/themes/classic/throbber.gif";
+  var SPINNER_THROBBER = "[% interface | html %]/lib/jquery/plugins/themes/classic/throbber.gif";
 [% END %]
 
 [% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") | $raw %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt
index ec906132df..52d8c2c698 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt
@@ -2,7 +2,7 @@
 [% USE Asset %]
 [% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; RecordedBooks search for '[% q | html %]'</title>
+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; RecordedBooks search for '[% q | html %]'</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% BLOCK cssinclude %]
 [% Asset.css("css/jquery.rating.css") | $raw %]
@@ -61,14 +61,14 @@
 
 [% INCLUDE 'opac-bottom.inc' %]
 [% BLOCK jsinclude %]
-[% Asset.js("js/recordedbooks.js") %]
-[% Asset.js("lib/jquery/plugins/jquery.rating.js") %]
+[% Asset.js("js/recordedbooks.js") | $raw %]
+[% Asset.js("lib/jquery/plugins/jquery.rating.js") | $raw %]
 <script type="text/javascript">
 var querystring = "[% q |replace( "'", "\'" ) |replace( '\n', '\\n' ) |replace( '\r', '\\r' ) |html %]";
-var results_per_page = [% OPACnumSearchResults || 20 %];
+var results_per_page = [% OPACnumSearchResults || 20 | html %];
 
 function search( page ) {
-    $( '#recordedbooks-status' ).html( MSG_SEARCHING.format("RecordedBooks") + ' <img class="throbber" src="[% interface %]/lib/jquery/plugins/themes/classic/throbber.gif" /></span>' );
+    $( '#recordedbooks-status' ).html( MSG_SEARCHING.format("RecordedBooks") + ' <img class="throbber" src="[% interface | html %]/lib/jquery/plugins/themes/classic/throbber.gif" /></span>' );
 
     KOHA.RecordedBooks.search( querystring, results_per_page, page, function( data ) {
         if ( data.error ) {
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 f1deebe15d..4d4fe4fa11 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -907,7 +907,7 @@ $(document).ready(function(){
         var $recordedbooks_results = $( '<div id="recordedbooks-results">' + MSG_SEARCHING.format('RecordedBooks') + ' <img class="throbber" src="[% interface | html %]/lib/jquery/plugins/themes/classic/throbber.gif" /></div>' );
         $( '#numresults' ) .append( ' ' )
             .append( $recordedbooks_results );
-        KOHA.RecordedBooks.search( querystring, [% OPACnumSearchResults || "null" %], null, function( data ) {
+        KOHA.RecordedBooks.search( querystring, [% OPACnumSearchResults || "null" | html %], null, function( data ) {
             if ( data.error ) {
                 $recordedbooks_results.html( MSG_ERROR_SEARCHING_COLLECTION.format('RecordedBooks')  + ': ' + data.error);
                 return;
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 58e3cf84d1..c7b50e8713 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -1074,11 +1074,11 @@
     </script>
     [% END %]
     [% IF RecordedBooksCirculation %]
-        [% Asset.js("js/recordedbooks.js") %]
+        [% Asset.js("js/recordedbooks.js") | $raw %]
         <script type="text/JavaScript">
             $(document).ready(function() {
                 [% IF ( recordedbooks_error ) %]
-                    KOHA.RecordedBooks.display_error("#opac-user-recordedbooks", "[% recordedbooks_error.dquote %]");
+                    KOHA.RecordedBooks.display_error("#opac-user-recordedbooks", "[% recordedbooks_error.dquote | html %]");
                 [% END %]
                 [% IF ( recordedbooks_tab ) %]
                     $("#opac-user-views").tabs("select", "#opac-user-recordedbooks");
-- 
2.39.5