Attachment 72208 Details for Bug 20286 – Bug 20286: Correctly escape URI characters in OPAC RSS template

[patch] Bug 20286: Correctly escape URI characters in OPAC RSS template

Bug-20286-Correctly-escape-URI-characters-in-OPAC-.patch (text/plain), 4.95 KB, created by Owen Leonard on 2018-02-26 14:02:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2018-02-26 14:02:01 UTC

Size: 4.95 KB

patch

obsolete

>From a271d3f3b3ffe4a604cbc76aba17caf9616676f8 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 26 Feb 2018 10:48:18 -0300
>Subject: [PATCH] Bug 20286: Correctly escape URI characters in OPAC RSS
> template
>
>Bug 19568 use the TT filter url whereas it must have escaped the URI
>characters with the uri filter.
>
>Test plan:
>Subscribe to an OPAC search
>=> Without this patch you will get an empty page
>=> With this patch applied you will see result list.
>---
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>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 b38ea1a..c415660 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
>@@ -20,7 +20,7 @@
>    <channel>
>      <title><![CDATA[[% LibraryName |html %] Search [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %]]]></title>
>      <link>[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=rss2</link>
>-     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |url %][% limit_cgi |url %]&amp;sort_by=[% sort_by | url %]&amp;format=rss2"/>
>+     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %]&amp;sort_by=[% sort_by | uri %]&amp;format=rss2"/>
>      <description><![CDATA[ Search results [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %] at [% LibraryName |html %]]]></description>
>      <opensearch:totalResults>[% total %]</opensearch:totalResults>
>      <opensearch:startIndex>[% offset %]</opensearch:startIndex>
>@@ -30,8 +30,8 @@
>        <opensearch:itemsPerPage>20</opensearch:itemsPerPage>
>      [% END %]
> 	 [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
>-     <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi |url %][% SEARCH_RESULT.limit_cgi |url %]&amp;sort_by=[% SEARCH_RESULT.sort_by |url %]&amp;format=opensearchdescription"/>
>-     <opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc |url %][% SEARCH_RESULT.limit_desc |url %]" startPage="[% SEARCH_RESULT.page %]" />
>+     <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi |uri %][% SEARCH_RESULT.limit_cgi |uri %]&amp;sort_by=[% SEARCH_RESULT.sort_by |uri %]&amp;format=opensearchdescription"/>
>+     <opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc |uri %][% SEARCH_RESULT.limit_desc |uri %]" startPage="[% SEARCH_RESULT.page %]" />
>      <item>
>        <title>[% SEARCH_RESULT.title |html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield |html %][% END %]</title>
>        <dc:identifier>ISBN [% SEARCH_RESULT.isbn |html %]</dc:identifier>
>@@ -44,7 +44,7 @@
> [% END %][% END %][% END %]
> 
> [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %]
>-[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]<a href="https://[% BakerTaylorBookstoreURL |url %][% bt_id %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL |url %][% bt_id %]" /></a>[% END %][% END %]
>+[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]<a href="https://[% BakerTaylorBookstoreURL |uri %][% bt_id %]"><img alt="See Baker &amp; Taylor" src="[% BakerTaylorImageURL |uri %][% bt_id %]" /></a>[% END %][% END %]
> 	   <p>[% 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 %]
>                     [% ELSE %][% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate |html %][% END %][% END %]
>@@ -69,7 +69,7 @@
>        xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
>    <id>[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=atom</id>
>    <title>[% LibraryName |html %] Search [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc |html %]'[% END %]</title>
>-    <link href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |url %][% limit_cgi |url %]&amp;format=rss2"/>
>+    <link href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %]&amp;format=rss2"/>
>    <updated>[% timestamp %]</updated>
>    <author>
>      <name>[% LibraryName |html %]</name>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20286: 72207 | 72208 | 72245 | 72280 | 72629 | 72630 | 72650 | 72651