Bugzilla – Attachment 81058 Details for
Bug 21526
TT variables used to build a link should be uri filtered
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21526: uri escape TT variables when used in 'a href'
Bug-21526-uri-escape-TT-variables-when-used-in-a-h.patch (text/plain), 652.85 KB, created by
Martin Renvoize (ashimema)
on 2018-10-24 11:29:46 UTC
(
hide
)
Description:
Bug 21526: uri escape TT variables when used in 'a href'
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2018-10-24 11:29:46 UTC
Size:
652.85 KB
patch
obsolete
>From 43a88b5909fbb68ba9d5425a7a5feb1b93a3cee3 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 15 Oct 2018 19:44:51 -0300 >Subject: [PATCH] Bug 21526: uri escape TT variables when used in 'a href' > >This patch has been generated with the script provided on bug 21576. >It only affects variable used in the href attribute of a link *when* >href it the first attribute of the node (grep "a href") > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../includes/acquisitions-add-to-basket.inc | 14 ++--- > .../prog/en/includes/acquisitions-toolbar.inc | 4 +- > .../includes/authorities-search-results.inc | 2 +- > .../prog/en/includes/authorities-toolbar.inc | 10 ++-- > .../prog/en/includes/authorities.inc | 2 +- > .../prog/en/includes/biblio-view-menu.inc | 2 +- > .../prog/en/includes/blocked-fines.inc | 4 +- > .../en/includes/budgets-admin-toolbar.inc | 14 ++--- > .../prog/en/includes/cat-toolbar.inc | 28 ++++----- > .../catalogue/itemsearch_item.json.inc | 6 +- > .../prog/en/includes/circ-menu.inc | 30 +++++----- > .../includes/circ-patron-search-results.inc | 4 +- > .../intranet-tmpl/prog/en/includes/facets.inc | 8 +-- > .../prog/en/includes/holds_table.inc | 4 +- > .../prog/en/includes/ill-toolbar.inc | 2 +- > .../prog/en/includes/intranet-bottom.inc | 4 +- > .../prog/en/includes/langmenu-staff-top.inc | 4 +- > .../prog/en/includes/members-toolbar.inc | 2 +- > .../prog/en/includes/merge-record.inc | 2 +- > .../prog/en/includes/patron-title.inc | 5 +- > .../prog/en/includes/patron-toolbar.inc | 4 +- > .../prog/en/includes/serials-menu.inc | 6 +- > .../prog/en/includes/serials-toolbar.inc | 4 +- > .../prog/en/includes/vendor-menu.inc | 12 ++-- > .../en/includes/virtualshelves-toolbar.inc | 10 ++-- > .../prog/en/modules/acqui/acqui-home.tt | 8 +-- > .../prog/en/modules/acqui/addorderiso2709.tt | 6 +- > .../prog/en/modules/acqui/basket.tt | 40 ++++++------- > .../prog/en/modules/acqui/basketgroup.tt | 18 +++--- > .../prog/en/modules/acqui/basketheader.tt | 2 +- > .../prog/en/modules/acqui/booksellers.tt | 6 +- > .../prog/en/modules/acqui/cancelorder.tt | 6 +- > .../prog/en/modules/acqui/edifactmsgs.tt | 6 +- > .../prog/en/modules/acqui/histsearch.tt | 10 ++-- > .../prog/en/modules/acqui/invoice-files.tt | 6 +- > .../prog/en/modules/acqui/invoice.tt | 12 ++-- > .../prog/en/modules/acqui/invoices.tt | 12 ++-- > .../prog/en/modules/acqui/lateorders.tt | 4 +- > .../prog/en/modules/acqui/neworderbiblio.tt | 8 +-- > .../prog/en/modules/acqui/neworderempty.tt | 6 +- > .../en/modules/acqui/newordersubscription.tt | 2 +- > .../en/modules/acqui/newordersuggestion.tt | 4 +- > .../prog/en/modules/acqui/ordered.tt | 6 +- > .../prog/en/modules/acqui/orderreceive.tt | 2 +- > .../prog/en/modules/acqui/parcel.tt | 58 +++++++++---------- > .../prog/en/modules/acqui/parcels.tt | 14 ++--- > .../prog/en/modules/acqui/spent.tt | 6 +- > .../prog/en/modules/acqui/supplier.tt | 6 +- > .../prog/en/modules/acqui/transferorder.tt | 4 +- > .../prog/en/modules/acqui/uncertainprice.tt | 8 +-- > .../prog/en/modules/acqui/z3950_search.tt | 6 +- > .../prog/en/modules/admin/aqbudgetperiods.tt | 22 +++---- > .../prog/en/modules/admin/aqbudgets.tt | 12 ++-- > .../prog/en/modules/admin/aqcontract.tt | 18 +++--- > .../prog/en/modules/admin/aqplan.tt | 6 +- > .../modules/admin/auth_subfields_structure.tt | 8 +-- > .../en/modules/admin/auth_tag_structure.tt | 18 +++--- > .../en/modules/admin/authorised_values.tt | 4 +- > .../prog/en/modules/admin/authtypes.tt | 6 +- > .../prog/en/modules/admin/biblio_framework.tt | 6 +- > .../modules/admin/branch_transfer_limits.tt | 2 +- > .../prog/en/modules/admin/branches.tt | 4 +- > .../prog/en/modules/admin/edi_accounts.tt | 2 +- > .../prog/en/modules/admin/itemtypes.tt | 10 ++-- > .../modules/admin/marc_subfields_structure.tt | 26 ++++----- > .../prog/en/modules/admin/marctagstructure.tt | 20 +++---- > .../prog/en/modules/admin/oai_sets.tt | 4 +- > .../en/modules/admin/systempreferences.tt | 2 +- > .../prog/en/modules/admin/usage_statistics.tt | 2 +- > .../prog/en/modules/admin/z3950servers.tt | 8 +-- > .../intranet-tmpl/prog/en/modules/auth.tt | 6 +- > .../en/modules/authorities/authorities.tt | 4 +- > .../prog/en/modules/authorities/detail.tt | 8 +-- > .../prog/en/modules/authorities/merge.tt | 6 +- > .../authorities/searchresultlist-auth.tt | 14 ++--- > .../modules/authorities/searchresultlist.tt | 6 +- > .../prog/en/modules/basket/basket.tt | 14 ++--- > .../prog/en/modules/catalogue/MARCdetail.tt | 6 +- > .../prog/en/modules/catalogue/advsearch.tt | 4 +- > .../prog/en/modules/catalogue/detail.tt | 48 +++++++-------- > .../prog/en/modules/catalogue/issuehistory.tt | 2 +- > .../prog/en/modules/catalogue/moredetail.tt | 20 +++---- > .../prog/en/modules/catalogue/results.tt | 14 ++--- > .../en/modules/catalogue/search-history.tt | 8 +-- > .../prog/en/modules/cataloguing/addbiblio.tt | 2 +- > .../prog/en/modules/cataloguing/addbooks.tt | 18 +++--- > .../prog/en/modules/cataloguing/additem.tt | 20 +++---- > .../prog/en/modules/cataloguing/merge.tt | 4 +- > .../cataloguing/value_builder/cn_browser.tt | 2 +- > .../cataloguing/value_builder/macles.tt | 4 +- > .../value_builder/marc21_linking_section.tt | 4 +- > .../modules/cataloguing/z3950_auth_search.tt | 2 +- > .../en/modules/cataloguing/z3950_search.tt | 4 +- > .../prog/en/modules/circ/article-requests.tt | 8 +-- > .../prog/en/modules/circ/branchoverdues.tt | 12 ++-- > .../prog/en/modules/circ/branchtransfers.tt | 10 ++-- > .../prog/en/modules/circ/checkout-notes.tt | 2 +- > .../prog/en/modules/circ/circulation-home.tt | 2 +- > .../prog/en/modules/circ/circulation.tt | 16 ++--- > .../circ/circulation_batch_checkouts.tt | 2 +- > .../prog/en/modules/circ/on-site_checkouts.tt | 6 +- > .../prog/en/modules/circ/overdue.tt | 6 +- > .../prog/en/modules/circ/pendingreserves.tt | 2 +- > .../prog/en/modules/circ/renew.tt | 12 ++-- > .../prog/en/modules/circ/request-article.tt | 8 +-- > .../prog/en/modules/circ/reserveratios.tt | 2 +- > .../prog/en/modules/circ/returns.tt | 42 +++++++------- > .../en/modules/circ/transferstoreceive.tt | 6 +- > .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- > .../prog/en/modules/circ/waitingreserves.tt | 10 ++-- > .../prog/en/modules/clubs/club-enrollments.tt | 2 +- > .../prog/en/modules/clubs/clubs.tt | 8 +-- > .../course_reserves/add_items-step1.tt | 2 +- > .../course_reserves/add_items-step2.tt | 2 +- > .../course_reserves/batch_add_items.tt | 2 +- > .../modules/course_reserves/course-details.tt | 12 ++-- > .../course_reserves/course-reserves.tt | 4 +- > .../prog/en/modules/course_reserves/course.tt | 2 +- > .../prog/en/modules/errors/errorpage.tt | 2 +- > .../prog/en/modules/ill/ill-requests.tt | 8 +-- > .../prog/en/modules/intranet-main.tt | 2 +- > .../en/modules/members/accountline-details.tt | 6 +- > .../prog/en/modules/members/boraccount.tt | 16 ++--- > .../prog/en/modules/members/discharges.tt | 2 +- > .../prog/en/modules/members/files.tt | 2 +- > .../prog/en/modules/members/holdshistory.tt | 2 +- > .../prog/en/modules/members/housebound.tt | 6 +- > .../prog/en/modules/members/mancredit.tt | 8 +-- > .../prog/en/modules/members/maninvoice.tt | 8 +-- > .../prog/en/modules/members/memberentrygen.tt | 6 +- > .../prog/en/modules/members/members-update.tt | 2 +- > .../prog/en/modules/members/merge-patrons.tt | 2 +- > .../en/modules/members/moremember-brief.tt | 8 +-- > .../en/modules/members/moremember-print.tt | 6 +- > .../en/modules/members/moremember-receipt.tt | 8 +-- > .../prog/en/modules/members/moremember.tt | 18 +++--- > .../prog/en/modules/members/pay.tt | 8 +-- > .../prog/en/modules/members/paycollect.tt | 10 ++-- > .../modules/members/purchase-suggestions.tt | 2 +- > .../prog/en/modules/members/readingrec.tt | 2 +- > .../prog/en/modules/members/routing-lists.tt | 4 +- > .../prog/en/modules/offline_circ/list.tt | 4 +- > .../en/modules/offline_circ/process_koc.tt | 8 +-- > .../prog/en/modules/patron_lists/list.tt | 2 +- > .../prog/en/modules/patron_lists/lists.tt | 10 ++-- > .../prog/en/modules/plugins/plugins-home.tt | 6 +- > .../prog/en/modules/reports/bor_issues_top.tt | 2 +- > .../en/modules/reports/cash_register_stats.tt | 4 +- > .../prog/en/modules/reports/catalogue_out.tt | 4 +- > .../modules/reports/guided_reports_start.tt | 12 ++-- > .../prog/en/modules/reports/itemslost.tt | 4 +- > .../en/modules/reports/orders_by_budget.tt | 4 +- > .../prog/en/modules/reports/reserves_stats.tt | 2 +- > .../prog/en/modules/reports/serials_stats.tt | 4 +- > .../prog/en/modules/reserve/request.tt | 34 +++++------ > .../prog/en/modules/reviews/reviewswaiting.tt | 8 +-- > .../modules/rotating_collections/addItems.tt | 2 +- > .../rotating_collections/editCollections.tt | 2 +- > .../rotatingCollections.tt | 8 +-- > .../en/modules/serials/checkexpiration.tt | 4 +- > .../prog/en/modules/serials/claims.tt | 2 +- > .../prog/en/modules/serials/routing.tt | 2 +- > .../en/modules/serials/serials-collection.tt | 8 +-- > .../prog/en/modules/serials/serials-search.tt | 12 ++-- > .../modules/serials/subscription-batchedit.tt | 4 +- > .../en/modules/serials/subscription-detail.tt | 10 ++-- > .../serials/subscription-frequencies.tt | 2 +- > .../serials/subscription-numberpatterns.tt | 2 +- > .../prog/en/modules/serials/viewalerts.tt | 4 +- > .../prog/en/modules/suggestion/suggestion.tt | 22 +++---- > .../prog/en/modules/tags/list.tt | 2 +- > .../prog/en/modules/tags/review.tt | 2 +- > .../prog/en/modules/tools/batchMod-del.tt | 10 ++-- > .../prog/en/modules/tools/batchMod-edit.tt | 8 +-- > .../en/modules/tools/batch_delete_records.tt | 10 ++-- > .../tools/batch_record_modification.tt | 16 ++--- > .../prog/en/modules/tools/csv-profiles.tt | 4 +- > .../prog/en/modules/tools/holidays.tt | 4 +- > .../prog/en/modules/tools/inventory.tt | 2 +- > .../prog/en/modules/tools/koha-news.tt | 4 +- > .../prog/en/modules/tools/letter.tt | 4 +- > .../en/modules/tools/manage-marc-import.tt | 10 ++-- > .../prog/en/modules/tools/modborrowers.tt | 2 +- > .../prog/en/modules/tools/overduerules.tt | 2 +- > .../prog/en/modules/tools/showdiffmarc.tt | 2 +- > .../prog/en/modules/tools/upload-images.tt | 2 +- > .../prog/en/modules/tools/viewlog.tt | 14 ++--- > .../prog/en/modules/virtualshelves/shelves.tt | 24 ++++---- > .../includes/authorities-search-results.inc | 2 +- > .../en/includes/masthead-langmenu.inc | 4 +- > .../bootstrap/en/includes/masthead.inc | 6 +- > .../en/includes/opac-authorities.inc | 6 +- > .../bootstrap/en/includes/opac-bottom.inc | 4 +- > .../bootstrap/en/includes/opac-facets.inc | 10 ++-- > .../bootstrap/en/includes/page-numbers.inc | 10 ++-- > .../bootstrap/en/includes/shelfbrowser.inc | 8 +-- > .../bootstrap/en/modules/errors/errorpage.tt | 2 +- > .../bootstrap/en/modules/maintenance.tt | 2 +- > .../bootstrap/en/modules/opac-advsearch.tt | 2 +- > .../en/modules/opac-alert-subscribe.tt | 4 +- > .../en/modules/opac-auth-MARCdetail.tt | 4 +- > .../bootstrap/en/modules/opac-auth-detail.tt | 2 +- > .../bootstrap/en/modules/opac-auth.tt | 12 ++-- > .../opac-authoritiessearchresultlist.tt | 10 ++-- > .../bootstrap/en/modules/opac-basket.tt | 6 +- > .../bootstrap/en/modules/opac-browser.tt | 4 +- > .../en/modules/opac-course-details.tt | 6 +- > .../en/modules/opac-course-reserves.tt | 2 +- > .../bootstrap/en/modules/opac-detail.tt | 58 +++++++++---------- > .../en/modules/opac-downloadshelf.tt | 2 +- > .../en/modules/opac-full-serial-issues.tt | 2 +- > .../bootstrap/en/modules/opac-idref.tt | 4 +- > .../bootstrap/en/modules/opac-illrequests.tt | 8 +-- > .../bootstrap/en/modules/opac-imageviewer.tt | 2 +- > .../bootstrap/en/modules/opac-main.tt | 2 +- > .../bootstrap/en/modules/opac-memberentry.tt | 2 +- > .../bootstrap/en/modules/opac-opensearch.tt | 4 +- > .../en/modules/opac-password-recovery.tt | 2 +- > .../en/modules/opac-readingrecord.tt | 4 +- > .../bootstrap/en/modules/opac-results.tt | 18 +++--- > .../en/modules/opac-routing-lists.tt | 2 +- > .../en/modules/opac-search-history.tt | 8 +-- > .../en/modules/opac-serial-issues.tt | 6 +- > .../bootstrap/en/modules/opac-shelves.tt | 22 +++---- > .../en/modules/opac-showreviews-rss.tt | 2 +- > .../bootstrap/en/modules/opac-showreviews.tt | 4 +- > .../bootstrap/en/modules/opac-tags_subject.tt | 2 +- > .../bootstrap/en/modules/opac-topissues.tt | 2 +- > .../bootstrap/en/modules/opac-user.tt | 14 ++--- > .../bootstrap/en/modules/sco/sco-main.tt | 2 +- > misc/cronjobs/rss/lastAcquired-1.0.tt | 2 +- > misc/cronjobs/rss/lastAcquired-2.0.tt | 2 +- > 232 files changed, 885 insertions(+), 884 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc >index 0bf441824c..1e2943324f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc >@@ -12,13 +12,13 @@ > <input type="submit" class="submit" value="Search" /> > </form> > </li> >- <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]">From a suggestion</a></li> >- <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]">From a subscription</a></li> >- <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]">From a new (empty) record</a></li> >- <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]">From an external source</a></li> >- <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno | html %]&booksellerid=[% booksellerid | html %]"> From a new file</a></li> >- <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]"> From a staged file</a></li> >- [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]">From titles with highest hold ratios</a></li>[% END %] >+ <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From a suggestion</a></li> >+ <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From a subscription</a></li> >+ <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From a new (empty) record</a></li> >+ <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From an external source</a></li> >+ <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl?basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]"> From a new file</a></li> >+ <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]"> From a staged file</a></li> >+ [% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/reserveratios.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">From titles with highest hold ratios</a></li>[% END %] > </ul> > [% ELSE %] > <div class="dialog alert"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >index 5ad1a08124..79824b3f3b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc >@@ -16,10 +16,10 @@ function confirm_deletion() { > </a> > <ul class="dropdown-menu"> > [% IF CAN_user_acquisition_order_manage && active %] >- <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid | html %]&op=add_form">Basket</a></li> >+ <li><a href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% booksellerid | uri %]&op=add_form">Basket</a></li> > [% END %] > [% IF CAN_user_acquisition_contracts_manage && active %] >- <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid | html %]">Contract</a></li> >+ <li><a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid | uri %]">Contract</a></li> > [% END %] > [% IF ( CAN_user_acquisition_vendors_manage ) %] > <li><a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Vendor</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc >index fe219ef199..06d66219df 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc >@@ -30,7 +30,7 @@ > [% IF ( authid ) %] > <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a> > [% ELSE %] >- <a href="[% searchurl | url %][% heading | html %]">[% heading | html %]</a> >+ <a href="[% searchurl | url %][% heading | uri %]">[% heading | html %]</a> > [% END %] > [% ELSE %] > [% heading | html %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >index 893df07b87..395026331c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc >@@ -14,7 +14,7 @@ > <li role="separator" class="divider"></li> > [% END %] > [% FOREACH authority_type IN authority_types %] >- <li><a href="/cgi-bin/koha/authorities/authorities.pl?authtypecode=[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</a></li> >+ <li><a href="/cgi-bin/koha/authorities/authorities.pl?authtypecode=[% authority_type.authtypecode | uri %]">[% authority_type.authtypetext | html %]</a></li> > [% END %] > </ul> > </div> >@@ -44,10 +44,10 @@ > <span class="caret"></span> > </a> > <ul class="dropdown-menu"> >- <li><a href="/cgi-bin/koha/authorities/export.pl?format=mads&op=export&authid=[% authid | html %]">MADS (XML)</a></li> >- <li><a href="/cgi-bin/koha/authorities/export.pl?format=marcxml&op=export&authid=[% authid | html %]">MARCXML</a></li> >- <li><a href="/cgi-bin/koha/authorities/export.pl?format=marc8&op=export&authid=[% authid | html %]">MARC (non-Unicode/MARC-8)</a></li> >- <li><a href="/cgi-bin/koha/authorities/export.pl?format=utf8&op=export&authid=[% authid | html %]">MARC (Unicode/UTF-8)</a></li> >+ <li><a href="/cgi-bin/koha/authorities/export.pl?format=mads&op=export&authid=[% authid | uri %]">MADS (XML)</a></li> >+ <li><a href="/cgi-bin/koha/authorities/export.pl?format=marcxml&op=export&authid=[% authid | uri %]">MARCXML</a></li> >+ <li><a href="/cgi-bin/koha/authorities/export.pl?format=marc8&op=export&authid=[% authid | uri %]">MARC (non-Unicode/MARC-8)</a></li> >+ <li><a href="/cgi-bin/koha/authorities/export.pl?format=utf8&op=export&authid=[% authid | uri %]">MARC (Unicode/UTF-8)</a></li> > </ul> > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc >index 45225f8917..1e37b65c7f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc >@@ -10,7 +10,7 @@ > [% IF ( node.current_value ) %] > <span class='currentauth'>[% node.value | html %]</span> > [% ELSE %] >- <a href="detail.pl?authid=[% node.authid | html %]" title="Term">[% node.value | html %]</a> >+ <a href="detail.pl?authid=[% node.authid | uri %]" title="Term">[% node.value | html %]</a> > [% END %] > [% IF ( node.children && node.children.size > 0 ) %] > [% PROCESS showtree tree = node.children %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc >index 430ad211cd..7da052b09f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc >@@ -31,7 +31,7 @@ > > [% IF Koha.Preference('ArticleRequests') %] > [% IF ( article_requests_view ) %]<li class="active">[% ELSE %]<li>[% END %] >- <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% IF ( object ) %][% object | html %][% ELSE %][% biblionumber | html %][% END %]">Article requests ([% Biblio.ArticleRequestsActiveCount( biblio_object_id ) | html %])</a></li> >+ <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% IF ( object ) %][% object | uri %][% ELSE %][% biblionumber | uri %][% END %]">Article requests ([% Biblio.ArticleRequestsActiveCount( biblio_object_id ) | html %])</a></li> > [% END %] > > [% IF ( subscriptionsnumber ) %]<li><a href="/cgi-bin/koha/serials/serials-search.pl?searched=1&biblionumber=[% biblio_object_id | url %]">Subscription(s)</a></li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >index 832706f98b..80b0514720 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc >@@ -7,7 +7,7 @@ > [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %] > <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> > [% END %] >- <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber | html %]" class="btn btn-default btn-xs" >Make payment</a> >- <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber | html %]" class="btn btn-default btn-xs" >Pay all fines</a></li> >+ <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber | uri %]" class="btn btn-default btn-xs" >Make payment</a> >+ <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber | uri %]" class="btn btn-default btn-xs" >Pay all fines</a></li> > </li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc >index f76b7876dc..980cca9e2c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc >@@ -10,15 +10,15 @@ > [% ELSE %] > <li> > [% END %] >- <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=[% budget_period_id | html %]">New fund for [% budget_period_description | html %]</a></li> >+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=[% budget_period_id | uri %]">New fund for [% budget_period_description | html %]</a></li> > </ul> > </div> > > <div class="btn-group"> > <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> > <ul class="dropdown-menu"> >- <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=[% budget_period_id | html %]">Edit budget [% budget_period_description | html %]</a></li> >- <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&budget_period_id=[% budget_period_id | html %]">Duplicate budget [% budget_period_description | html %]</a></li> >+ <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=[% budget_period_id | uri %]">Edit budget [% budget_period_description | html %]</a></li> >+ <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl?op=duplicate_form&budget_period_id=[% budget_period_id | uri %]">Duplicate budget [% budget_period_description | html %]</a></li> > </ul> > </div> > >@@ -30,26 +30,26 @@ > [% ELSE %] > <li class="disabled"> > [% END %] >- <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | html %]&authcat=MONTHS">Plan by months</a></li> >+ <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&authcat=MONTHS">Plan by months</a></li> > [% IF ( CAN_user_acquisition_planning_manage ) %] > <li> > [% ELSE %] > <li class="disabled"> > [% END %] >- <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | html %]&authcat=BRANCHES">Plan by libraries</a></li> >+ <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&authcat=BRANCHES">Plan by libraries</a></li> > [% IF ( CAN_user_acquisition_planning_manage ) %] > <li> > [% ELSE %] > <li class="disabled"> > [% END %] >- <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | html %]&authcat=ITEMTYPES">Plan by item types</a></li> >+ <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&authcat=ITEMTYPES">Plan by item types</a></li> > [% FOREACH auth_cats_loo IN auth_cats_loop %] > [% IF ( CAN_user_acquisition_planning_manage ) %] > <li> > [% ELSE %] > <li class="disabled"> > [% END %] >- <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | html %]&authcat=[% auth_cats_loo | html %]">Plan by [% auth_cats_loo | html %]</a> >+ <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]&authcat=[% auth_cats_loo | uri %]">Plan by [% auth_cats_loo | html %]</a> > </li> > [% END %] > </ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >index d5191e30fd..d17964187d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc >@@ -18,10 +18,10 @@ CAN_user_serials_create_subscription ) %] > [% END %] > > [% IF ( EasyAnalyticalRecords && CAN_user_editcatalogue_edit_catalogue ) %] >- <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]&analyze=1">Analyze items</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&analyze=1">Analyze items</a></li> > [% END %] > [% IF CAN_user_editcatalogue_edit_catalogue && ! EasyAnalyticalRecords %] >- <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber | html %]">New child record</a></li> >+ <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?parentbiblionumber=[% biblionumber | uri %]">New child record</a></li> > [% END %] > </ul> > </div> >@@ -55,10 +55,10 @@ CAN_user_serials_create_subscription ) %] > [% END %] > [% END %] > >- [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber | html %]">Attach item</a></li>[% END %] >+ [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber | uri %]">Attach item</a></li>[% END %] > >- [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber | html %]">Link to host item</a>[% END %][% END %] >- [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]<li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber | html %]&filetype=image">Upload image</a>[% END %][% END %] >+ [% IF ( EasyAnalyticalRecords ) %][% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/linkitem.pl?biblionumber=[% biblionumber | uri %]">Link to host item</a>[% END %][% END %] >+ [% IF ( LocalCoverImages || OPACLocalCoverImages) %][% IF ( CAN_user_tools_upload_local_cover_images ) %]<li><a href="/cgi-bin/koha/tools/upload-cover-image.pl?biblionumber=[% biblionumber | uri %]&filetype=image">Upload image</a>[% END %][% END %] > > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] > <li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]&op=duplicate">Edit as new (duplicate)</a></li> >@@ -88,14 +88,14 @@ CAN_user_serials_create_subscription ) %] > <div class="btn-group"> > <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Save <span class="caret"></span></button> > <ul class="dropdown-menu"> >- <li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&op=export&bib=[% biblionumber | html %]">BIBTEX</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/export.pl?format=bibtex&op=export&bib=[% biblionumber | uri %]">BIBTEX</a></li> > <li><a href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li> >- <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcxml&op=export&bib=[% biblionumber | html %]">MARCXML</a></li> >- <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marc8&op=export&bib=[% biblionumber | html %]">MARC (non-Unicode/MARC-8)</a></li> >- <li><a href="/cgi-bin/koha/catalogue/export.pl?format=utf8&op=export&bib=[% biblionumber | html %]">MARC (Unicode/UTF-8)</a></li> >- <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcstd&op=export&bib=[% biblionumber | html %]">MARC (Unicode/UTF-8, Standard)</a></li> >- <li><a href="/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=[% biblionumber | html %]">MODS (XML)</a></li> >- <li><a href="/cgi-bin/koha/catalogue/export.pl?format=ris&op=export&bib=[% biblionumber | html %]">RIS</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcxml&op=export&bib=[% biblionumber | uri %]">MARCXML</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marc8&op=export&bib=[% biblionumber | uri %]">MARC (non-Unicode/MARC-8)</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/export.pl?format=utf8&op=export&bib=[% biblionumber | uri %]">MARC (Unicode/UTF-8)</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/export.pl?format=marcstd&op=export&bib=[% biblionumber | uri %]">MARC (Unicode/UTF-8, Standard)</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=[% biblionumber | uri %]">MODS (XML)</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/export.pl?format=ris&op=export&bib=[% biblionumber | uri %]">RIS</a></li> > </ul> > </div> > >@@ -125,8 +125,8 @@ CAN_user_serials_create_subscription ) %] > <span class="caret"></span> > </button> > <ul class="dropdown-menu"> >- <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]">Place hold</a></li> >- <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]&findborrower=[% holdfor_cardnumber | html %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></li> >+ <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">Place hold</a></li> >+ <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]&findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></li> > </ul> > </div> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc >index f683757080..45b43f647b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc >@@ -5,13 +5,13 @@ > [%- biblioitem = item.biblioitem -%] > [ > "[% FILTER escape_quotes = replace('"', '\"') ~%] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | html %]" title="Go to record detail page">[% biblio.title | html %]</a>[% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %] by[% END %] [% biblio.author | html %] >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]" title="Go to record detail page">[% biblio.title | html %]</a>[% IF ( Koha.Preference( 'marcflavour' ) == 'UNIMARC' && biblio.author ) %] by[% END %] [% biblio.author | html %] > [%~ END %]", > "[% (biblioitem.publicationyear || biblio.copyrightdate) | html %]", > "[% biblioitem.publishercode | html %]", > "[% AuthorisedValues.GetByCode( 'CCODE', item.ccode ) | html %]", > "[% FILTER escape_quotes ~%] >- <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | html %]#item[% item.itemnumber | html %]" title="Go to item details">[% item.barcode | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]#item[% item.itemnumber | uri %]" title="Go to item details">[% item.barcode | html %]</a> > [%~ END %]", > "[% item.itemcallnumber | html %]", > "[% Branches.GetName(item.homebranch) | html %]", >@@ -21,6 +21,6 @@ > "[% item.status | html %]", > "[% (item.issues || 0) | html %]", > "[% FILTER escape_quotes ~%] >- <div class="btn-group dropup"><button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-pencil"></i> Edit <span class="caret"></span> </button> <ul class="dropdown-menu"> <li><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]">Edit item</a></li> <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% item.biblionumber | html %]">Edit record</a></li> </ul> </div> >+ <div class="btn-group dropup"><button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-pencil"></i> Edit <span class="caret"></span> </button> <ul class="dropdown-menu"> <li><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% item.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]">Edit item</a></li> <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% item.biblionumber | html %]">Edit record</a></li> </ul> </div> > [%~ END %]" > ] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >index a69d099e92..25592900a8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >@@ -73,56 +73,56 @@ > <div id="menu"> > <ul> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | html %]">Check out</a></li> >+ [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | uri %]">Check out</a></li> > [% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ patron.categorycode _ '$').size > 0 %] >- [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | html %]&batch=1">Batch check out</a></li> >+ [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber | uri %]&batch=1">Batch check out</a></li> > [% END %] > [% END %] > [% IF CAN_user_borrowers_edit_borrowers %] >- [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">Details</a></li> >+ [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">Details</a></li> > [% END %] > [% IF ( CAN_user_updatecharges ) %] >- [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]">Fines</a></li> >+ [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Fines</a></li> > [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% patron.borrowernumber | html %]">Routing lists</a></li>[% END %] >+ [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% patron.borrowernumber | uri %]">Routing lists</a></li>[% END %] > [% END %] > [% IF CAN_user_borrowers_edit_borrowers %] > [% IF ( intranetreadinghistory ) %] >- [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber | html %]">Circulation history</a></li> >+ [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber | uri %]">Circulation history</a></li> > [% END %] > [% END %] > [% IF CAN_user_borrowers_edit_borrowers %] > [% IF ( intranetreadinghistory ) %] >- [% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% patron.borrowernumber | html %]">Holds history</a></li> >+ [% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% patron.borrowernumber | uri %]">Holds history</a></li> > [% END %] > [% END %] > [% IF ( CAN_user_tools_view_system_logs ) %] >- [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=circulation&object=[% patron.borrowernumber | html %]&src=circ">Modification log</a></li> >+ [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=circulation&object=[% patron.borrowernumber | uri %]&src=circ">Modification log</a></li> > [% END %] > [% IF CAN_user_borrowers_edit_borrowers %] >- [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | html %]">Notices</a></li> >+ [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber | uri %]">Notices</a></li> > [% END %] > [% IF CAN_user_borrowers_edit_borrowers %] >- [% IF ( statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber | html %]">Statistics</a></li> >+ [% IF ( statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber | uri %]">Statistics</a></li> > [% END %] > [% IF CAN_user_borrowers_edit_borrowers %] > [% IF ( EnableBorrowerFiles ) %] >- [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | html %]">Files</a></li> >+ [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber | uri %]">Files</a></li> > [% END %] > [% END %] > > [% IF CAN_user_acquisition_suggestions_manage %] >- [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber | html %]">Purchase suggestions</a></li> >+ [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber | uri %]">Purchase suggestions</a></li> > [% END %] > [% IF CAN_user_borrowers_edit_borrowers && useDischarge %] >- [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber | html %]">Discharges</a></li> >+ [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber | uri %]">Discharges</a></li> > [% END %] > [% IF Koha.Preference('HouseboundModule') %] >- [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | html %]">Housebound</a></li> >+ [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | uri %]">Housebound</a></li> > [% END %] > [% IF Koha.Preference('ILLModule') && CAN_user_ill %] >- <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber | html %]">Interlibrary loans</a></li> >+ <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber | uri %]">Interlibrary loans</a></li> > [% END %] > </ul></div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc >index 08e4a2a38f..dbad05777e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc >@@ -15,7 +15,7 @@ > [% FOREACH borrower IN borrowers %] > [% IF destination == "circ" %] > <tr class="clickable" data-url="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber | html %]"> >- <td><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber | html %]">[% borrower.surname | html %], [% borrower.firstname | html %]</a></td> >+ <td><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrower.borrowernumber | uri %]">[% borrower.surname | html %], [% borrower.firstname | html %]</a></td> > [% ELSIF destination == "holds" %] > [% IF multi_hold %] > [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&multi_hold=1&biblionumbers=" _ biblionumbers %] >@@ -23,7 +23,7 @@ > [% SET data_url = "/cgi-bin/koha/reserve/request.pl?borrowernumber=" _ borrower.borrowernumber _ "&biblionumber=" _ biblionumber %] > [% END %] > <tr class="clickable" data-url="[% data_url | html %]"> >- <td><a href="[% data_url | html %]">[% borrower.surname | html %], [% borrower.firstname | html %]</a></td> >+ <td><a href="[% data_url | uri %]">[% borrower.surname | html %], [% borrower.firstname | html %]</a></td> > [% END %] > <td>[% borrower.cardnumber | html %]</td> > <td>[% borrower.dateofbirth | $KohaDates %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc >index 3943c0ab6f..b05084898a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc >@@ -4,7 +4,7 @@ > <div id="search-facets"> > <h4>Refine your search</h4> > <ul> >- <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | html %][% limit_cgi_not_availablity | html %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | html %][% limit_cgi | html %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]&limit=available">Limit to currently available items</a>[% END %]</li></ul> >+ <li id="availability_facet">Availability<ul><li>[% IF ( available ) %]<strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | uri %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">Show all items</a>[% ELSE %]<a href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | html %][% limit_cgi | html %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]&limit=available">Limit to currently available items</a>[% END %]</li></ul> > [% IF ( related ) %] <li>(related searches: [% FOREACH relate IN related %][% relate.related_search | html %][% END %])</li>[% END %] > </li> > >@@ -33,10 +33,10 @@ > [% IF facet.active %] > [% SET local_url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] > <span class="facet-label">[% facet.facet_label_value | html %]</span> >- [<a href="[% local_url | html %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>] >+ [<a href="[% local_url | uri %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>] > [% ELSE %] > [% SET local_url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] >- <span class="facet-label"><a href="[% local_url | html %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span> >+ <span class="facet-label"><a href="[% local_url | uri %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span> > [% IF ( displayFacetCount ) %] > <span class="facet-count"> ([% facet.facet_count | html %])</span> > [% END %] >@@ -45,7 +45,7 @@ > [% END %] > [% IF ( facets_loo.expandable ) %] > <li class="showmore"> >- <a href="[% url | html %][% IF offset %]&offset=[% offset |url %][% END %]&expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a> >+ <a href="[% url | uri %][% IF offset %]&offset=[% offset |url %][% END %]&expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a> > </li> > [% END %] > </ul></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc >index a04d1e0095..804c868c3b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc >@@ -123,7 +123,7 @@ > > <td> > [% IF ( hold.found ) %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber | html %]"> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber | uri %]"> > [% IF ( hold.barcodenumber ) %] > [% hold.barcodenumber | html %] > <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" /> >@@ -135,7 +135,7 @@ > [% IF ( hold.item_level_hold ) %] > <i> > Only item >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber | html %]"> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblionumber | uri %]"> > [% IF ( hold.barcodenumber ) %] > [% hold.barcodenumber | html %] > <input type="hidden" name="itemnumber" value="[% hold.itemnumber | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc >index 45a3c6839e..f3ef56c74b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc >@@ -9,7 +9,7 @@ > </button> > <ul class="dropdown-menu" aria-labelledby="ill-backend-dropdown"> > [% FOREACH backend IN backends %] >- <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backend | html %]">[% backend | html %]</a></li> >+ <li><a href="/cgi-bin/koha/ill/ill-requests.pl?method=create&backend=[% backend | uri %]">[% backend | html %]</a></li> > [% END %] > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >index 37ebda8444..432bde7a5a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc >@@ -31,7 +31,7 @@ > [% IF ( sublanguages_loo.sublanguage_current ) %] > <li class="navbar-text"> <span class="currentlanguage disabled">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</span></li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | html %]"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li> >+ <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li> > [% END %] > [% END %] > >@@ -49,7 +49,7 @@ > [% END %] > </li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | html %]"> >+ <li><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]"> > [% IF ( languages_loo.native_description ) %] > [% languages_loo.native_description | html %] > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc >index 21725d09f6..d7fab933d9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/langmenu-staff-top.inc >@@ -11,7 +11,7 @@ > [% IF ( sublanguages_loo.sublanguage_current ) %] > <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] <i class="fa fa-check"></i></a></li> > [% ELSE %] >- <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | html %]" tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li> >+ <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]" tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li> > [% END %] > [% END # / IF sublanguages_loo.enabled %] > [% END # / FOREACH sublanguages_loo %] >@@ -20,7 +20,7 @@ > [% IF ( languages_loo.current ) %] > <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %] <i class="fa fa-check"></i></a></li> > [% ELSE %] >- <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | html %]" tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li> >+ <li role="presentation"><a href="/cgi-bin/koha/changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]" tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li> > [% END %] > [% END # / IF languages_loo.current %] > [% END # / IF ( languages_loo.plural ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >index 3f9a0ea744..c289b2546a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >@@ -59,7 +59,7 @@ > [% END %] > > [% IF CAN_user_borrowers_edit_borrowers && useDischarge %] >- <li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber | html %]">Discharge</a></li> >+ <li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber | uri %]">Discharge</a></li> > [% END %] > > [% IF Koha.Preference('RESTOAuth2ClientCredentials') %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >index 0a366564fb..6d14015916 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/merge-record.inc >@@ -50,7 +50,7 @@ > <ul> > [% FOREACH record IN sourcerecords %] > <li> >- <a href="#tabrecord[% record.recordid | html %]"> >+ <a href="#tabrecord[% record.recordid | uri %]"> > [% record.recordid | html %] > [% IF record.reference %](ref)[% END %] > </a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >index 362be9bbd5..aae912a66a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc >@@ -1,3 +1,4 @@ >+[% USE raw %] > [%- USE raw -%] > [%- USE Koha -%] > [%- USE Branches -%] >@@ -51,8 +52,8 @@ > [%- END -%] > [%- END -%] > [%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%] >- [%- IF link_to == 'circulation_reserves' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | html %]#reserves"> >- [%- ELSE %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]"> >+ [%- IF link_to == 'circulation_reserves' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | uri %]#reserves"> >+ [%- ELSE %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | uri %]"> > [%- END -%] > [%- END -%] > [%- IF display_patron_name -%] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc >index e0bc706b35..7c23f5efa2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc >@@ -8,14 +8,14 @@ > <div class="btn-group" id="new-patron-button"> > <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New patron <span class="caret"></span></button> > <ul class="dropdown-menu"> >- [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode | html %]">[% category.description | html %]</a></li>[% END %] >+ [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode | uri %]">[% category.description | html %]</a></li>[% END %] > </ul> > </div> > [% IF Koha.Preference('PatronQuickAddFields') || Koha.Preference('BorrowerMandatoryField') %] > <div class="btn-group" id="quick-add-new-patron-button"> > <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> Quick add new patron <span class="caret"></span></button> > <ul class="dropdown-menu"> >- [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode | html %]&quickadd=true">[% category.description | html %]</a></li>[% END %] >+ [% FOREACH category IN categories %]<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&categorycode=[% category.categorycode | uri %]&quickadd=true">[% category.description | html %]</a></li>[% END %] > </ul> > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc >index af7989df2a..d2dc4c8a7c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc >@@ -1,12 +1,12 @@ > [% IF ( subscriptionid ) %] > <ul> >-<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid | html %]">Serial collection</a></li> >+<li><a href="serials-collection.pl?subscriptionid=[% subscriptionid | uri %]">Serial collection</a></li> > [% UNLESS closed %] > [% IF ( routing && CAN_user_serials_routing ) %] > [% IF ( hasRouting ) %] >- <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | html %]">Edit routing list</a></li> >+ <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]">Edit routing list</a></li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | html %]&op=new">Create routing list</a></li> >+ <li><a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]&op=new">Create routing list</a></li> > [% END %] > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >index 55d3722c5f..e889278d9e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >@@ -16,10 +16,10 @@ > <ul class="dropdown-menu"> > [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %] > <li> [% END %] >- <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=[% subscriptionid | html %]">Edit subscription</a></li> >+ <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=[% subscriptionid | uri %]">Edit subscription</a></li> > [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %] > <li> [% END %] >- <a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&subscriptionid=[% subscriptionid | html %]">Edit as new (duplicate)</a></li> >+ <a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&subscriptionid=[% subscriptionid | uri %]">Edit as new (duplicate)</a></li> > > [% IF CAN_user_editcatalogue_edit_catalogue %] > <li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]">Edit record</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >index e5a5214592..3fc669e840 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/vendor-menu.inc >@@ -1,14 +1,14 @@ > [% IF ( booksellerid ) %] > <div id="menu"> > <ul> >- [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | html %]">Baskets</a></li>[% END %] >- [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | html %]">Basket groups</a></li>[% END %] >- [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]">Contracts</a></li>[% END %] >- <li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid | html %]&op=do_search">Invoices</a></li> >+ [% IF ( CAN_user_acquisition_order_manage ) %]<li><a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]">Baskets</a></li>[% END %] >+ [% IF ( CAN_user_acquisition_group_manage ) %]<li><a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]">Basket groups</a></li>[% END %] >+ [% IF ( CAN_user_acquisition_contracts_manage ) %]<li><a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a></li>[% END %] >+ <li><a href="/cgi-bin/koha/acqui/invoices.pl?supplierid=[% booksellerid | uri %]&op=do_search">Invoices</a></li> > [% IF ( CAN_user_acquisition_order_manage ) %][% IF ( basketno ) %] >- <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&owner=1">Uncertain prices</a></li> >+ <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&owner=1">Uncertain prices</a></li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | html %]&owner=1">Uncertain prices</a></li> >+ <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&owner=1">Uncertain prices</a></li> > [% END %] [% END %] > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc >index 831534cabf..2409a58784 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc >@@ -8,7 +8,7 @@ > <div class="btn-group"> > <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> > <ul class="dropdown-menu"> >- <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=edit_form&shelfnumber=[% shelf.shelfnumber | html %]&referer=[% op | html %]">Edit list</a></li> >+ <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=edit_form&shelfnumber=[% shelf.shelfnumber | uri %]&referer=[% op | uri %]">Edit list</a></li> > <li><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=delete&shelfnumber=[% shelf.shelfnumber | html %]">Delete list</a></li> > </ul> > </div> >@@ -17,11 +17,11 @@ > <div class="btn-group"> > <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-download"></i> Download list <span class="caret"></span></button> > <ul class="dropdown-menu"> >- <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709&shelfid=[% shelf.shelfnumber | html %]">MARC</a></li> >- <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=ris&shelfid=[% shelf.shelfnumber | html %]">RIS</a></li> >- <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=bibtex&shelfid=[% shelf.shelfnumber | html %]">BibTex</a></li> >+ <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=iso2709&shelfid=[% shelf.shelfnumber | uri %]">iso2709</a></li> >+ <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=ris&shelfid=[% shelf.shelfnumber | uri %]">RIS</a></li> >+ <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=bibtex&shelfid=[% shelf.shelfnumber | uri %]">BibTex</a></li> > [% FOREACH csv_profile IN csv_profiles %] >- <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=[% csv_profile.export_format_id | html %]&shelfid=[% shelf.shelfnumber | html %]">CSV - [% csv_profile.profile | html %]</a></li> >+ <li><a href="/cgi-bin/koha/virtualshelves/downloadshelf.pl?format=[% csv_profile.export_format_id | uri %]&shelfid=[% shelf.shelfnumber | uri %]">CSV - [% csv_profile.profile | html %]</a></li> > [% END %] > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index d02bdbd221..087d23836e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -113,14 +113,14 @@ > <td>Budget [% loop_budge.budget_period_description | html %] [id=[% loop_budge.budget_period_id | html %]][% UNLESS loop_budge.budget_period_active %] (inactive)[% END %]</td> > <td> > [% IF ( CAN_user_acquisition_budget_manage ) %] >- <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% loop_budge.budget_period_id | html %]">[% loop_budge.budget_code | html %]</a> >+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% loop_budge.budget_period_id | uri %]">[% loop_budge.budget_code | html %]</a> > [% ELSE %] > [% loop_budge.budget_code | html %] > [% END %] > </td> > <td>[% loop_budge.budget_name | html %]</td> > <td>[% IF ( loop_budge.budget_owner ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loop_budge.budget_owner.borrowernumber | html %]">[% loop_budge.budget_owner.surname | html %], [% loop_budge.budget_owner.firstname | html %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loop_budge.budget_owner.borrowernumber | uri %]">[% loop_budge.budget_owner.surname | html %], [% loop_budge.budget_owner.firstname | html %]</a> > [% ELSE %] > > [% END %] >@@ -134,7 +134,7 @@ > [% END %] > </td> > <td class="data"> >- <a href="ordered.pl?fund=[% loop_budge.budget_id | html %]&fund_code=[% loop_budge.budget_code | html %]"> >+ <a href="ordered.pl?fund=[% loop_budge.budget_id | uri %]&fund_code=[% loop_budge.budget_code | uri %]"> > [% IF loop_budge.budget_parent_id %] > [% loop_budge.budget_ordered | $Price %] > [% ELSE %] >@@ -143,7 +143,7 @@ > </a> > </td> > <td class="data"> >- <a href="spent.pl?fund=[% loop_budge.budget_id | html %]&fund_code=[% loop_budge.budget_code | html %]"> >+ <a href="spent.pl?fund=[% loop_budge.budget_id | uri %]&fund_code=[% loop_budge.budget_code | uri %]"> > [% IF loop_budge.budget_parent_id %] > [% loop_budge.budget_spent | $Price %] > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 50d8773251..cb9ea5270d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -88,7 +88,7 @@ > <span class="citation">[% biblio.citation | html %]</span> > </label> > <span class="links" style="font-weight: normal;"> >- ( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | html %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&breedingid=[% biblio.import_record_id | html %]&import_batch_id=[% biblio.import_batch_id | html %]&biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> ) >+ ( <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% biblio.import_record_id | uri %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% biblio.import_record_id | html %]" class="previewData">Card</a> | <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&breedingid=[% biblio.import_record_id | html %]&import_batch_id=[% biblio.import_batch_id | html %]&biblionumber=[% biblio.match_biblionumber | html %]">Add order</a> ) > </span> > </legend> > <div style="float:left"> >@@ -105,7 +105,7 @@ > [% biblio_lis.overlay_status | html %] > [% END %] > [% IF ( biblio.match_biblionumber ) %] >- Matches biblio [% biblio.match_biblionumber | html %] (score = [% biblio.match_score | html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber | html %]">[% biblio.match_citation | html %]</a> >+ Matches biblio [% biblio.match_biblionumber | uri %] (score = [% biblio.match_score | html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber | uri %]">[% biblio.match_citation | html %]</a> > [% END %] > </span> > </li> >@@ -413,7 +413,7 @@ > </td> > <td><span title="[% batch_lis.staged_date | html %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 | html %]</span></td> > <td>[% batch_lis.num_records | html %]</td> >- <td><a href="[% batch_lis.scriptname | html %]?import_batch_id=[% batch_lis.import_batch_id | html %]&basketno=[% basketno | html %]&booksellerid=[% booksellerid | html %]">Add orders</a></td> >+ <td><a href="[% batch_lis.scriptname | uri %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]">Add orders</a></td> > </tr> > [% END %] > </tbody> >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..03b139cb4f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -36,7 +36,7 @@ > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> › >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> › > [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname | html %] [% IF ( basketno ) %]([% basketno | html %])[% END %] for [% booksellername | html %] > </div> > >@@ -58,25 +58,25 @@ > [% IF active %] > <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default btn-sm" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div> > [% END %] >- <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&op=add_form" class="btn btn-default btn-sm" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div> >+ <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&op=add_form" class="btn btn-default btn-sm" id="basketheadbutton"><i class="fa fa-pencil"></i> Edit basket</a></div> > [%# FIXME This action should not be available for everyone %] > <div class="btn-group"><a href="#deleteBasketModal" role="button" class="btn btn-default btn-sm" data-toggle="modal" id="delbasketbutton"><i class="fa fa-trash"></i> Delete this basket</a></div> > [% IF ( unclosable ) %] > [% ELSIF ( uncertainprices ) %] >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | html %]&owner=1" class="btn btn-default btn-sm" id="uncertpricesbutton"><i class="fa fa-usd"></i> Uncertain prices</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% booksellerid | uri %]&owner=1" class="btn btn-default btn-sm" id="uncertpricesbutton"><i class="fa fa-usd"></i> Uncertain prices</a></div> > <div title="Can not close baskets that have items with uncertain prices in them." class="btn-group"> > <a href="" class="btn btn-default btn-sm disabled" id="closebutton"><i class="fa fa-times-circle"></i> Close this basket</a> > </div> > [% ELSE %] > <div class="btn-group"> >- <a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basketno | html %]&booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm" id="closebutton"><i class="fa fa-times-circle"></i> Close this basket</a> >+ <a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="closebutton"><i class="fa fa-times-circle"></i> Close this basket</a> > </div> > [% END %] > > [% PROCESS csv_export %] > > [% IF ediaccount %] >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno | html %]&booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/edi_ean.pl?op=ediorder&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="ediorderbutton"><i class="fa fa-download"></i> Create EDIFACT order</a></div> > [% END %] > > [% IF ( active && books_loop ) %] >@@ -171,7 +171,7 @@ > <p><strong>The following records could not be deleted:</strong></p> > <ul> > [% FOREACH cannotdelbiblio IN cannotdelbiblios %] >- <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cannotdelbiblio.biblionumber | html %]">[% cannotdelbiblio.title | html %]</a> by [% cannotdelbiblio.author | html %]: >+ <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cannotdelbiblio.biblionumber | uri %]">[% cannotdelbiblio.title | html %]</a> by [% cannotdelbiblio.author | html %]: > <ul> > [% IF (cannotdelbiblio.itemcount) %]<li>[% cannotdelbiblio.itemcount | html %] item(s) attached.</li>[% END %] > [% IF (cannotdelbiblio.subscriptions) %]<li>[% cannotdelbiblio.subscriptions | html %] subscription(s) attached.</li>[% END %] >@@ -184,7 +184,7 @@ > </div> > <a href="booksellers.pl">Click here to go back to booksellers page</a> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a> > [% END %] > [% ELSE %] > >@@ -204,7 +204,7 @@ > [% END %] > </div> > [% END %] >- <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a></h1> >+ <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for <a href="supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > [% IF ( basketno ) %] > <div id="acqui_basket_summary" class="yui-g"> > <div class="rows"> >@@ -213,7 +213,7 @@ > [% IF ( basketnote ) %]<li><span class="label">Internal note:</span> [% basketnote | html %]</li>[% END %] > [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %] > [% IF ( basketcontractno ) %] >- <li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&contractnumber=[% basketcontractno | html %]&booksellerid=[% booksellerid | html %]">[% basketcontractname | html %]</a></li> >+ <li><span class="label">Contract name:</span> <a href="../admin/aqcontract.pl?op=add_form&contractnumber=[% basketcontractno | uri %]&booksellerid=[% booksellerid | uri %]">[% basketcontractname | html %]</a></li> > [% END %] > [% IF deliveryplace %]<li><span class="label">Delivery place:</span> [% Branches.GetName( deliveryplace ) | html %]</li>[% END %] > [% IF billingplace %]<li><span class="label">Billing place:</span> [% Branches.GetName( billingplace ) | html %]</li>[% END %] >@@ -294,7 +294,7 @@ > [% END %] > [% IF basketgroup.closed %] > [% IF ( CAN_user_acquisition_group_manage ) %] >- <a href="basketgroup.pl?op=add&booksellerid=[% booksellerid | html %]&basketgroupid=[% basketgroup.id | html %]" title="basketgroup">[% basketgroup.name | html %] (closed)</a> >+ <a href="basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]" title="basketgroup">[% basketgroup.name | html %] (closed)</a> > [% ELSE %] > [% basketgroup.name | html %] (closed) > [% END %] >@@ -339,7 +339,7 @@ > [% END %] > [% IF ( duplinbatch ) %]<div class="dialog alert"> > <h4>Duplicate warning</h4> >- <p>Some records have not been automatically added because they match an existing record in your catalog:<a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch | html %]&basketno=[% basketno | html %]&booksellerid=[% booksellerid | html %]" title="Open in new window" target="_blank" class="popup" style="margin-left:10px">Display them</a></p> >+ <p>Some records have not been automatically added because they match an existing record in your catalog:<a href="/cgi-bin/koha/acqui/addorderiso2709.pl?import_batch_id=[% duplinbatch | uri %]&basketno=[% basketno | uri %]&booksellerid=[% booksellerid | uri %]" title="Open in new window" target="_blank" class="popup" style="margin-left:10px">Display them</a></p> > </div>[% END %] > > <div id="acqui_basket_content" class="yui-g"> >@@ -436,7 +436,7 @@ > <p> > [% IF ( books_loo.order_received ) %] (rcvd)[% END %] > [% IF books_loo.title %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber | html %]">[% books_loo.title | html %]</a>[% IF books_loo.author %] by [% books_loo.author | html %][% END %] >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber | uri %]">[% books_loo.title | html %]</a>[% IF books_loo.author %] by [% books_loo.author | html %][% END %] > [% ELSE %] > <em>Deleted bibliographic record, can't find title</em><br /> > [% END %] >@@ -450,7 +450,7 @@ > [% IF ( books_loo.suggestionid ) %] > <br/> > Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby | html %] [% END %] >- (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | html %]&op=show">suggestion #[% books_loo.suggestionid | html %]</a>) >+ (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&op=show">suggestion #[% books_loo.suggestionid | html %]</a>) > [% END %] > </p> > [% IF ( books_loo.order_internalnote ) %] >@@ -468,8 +468,8 @@ > [% bookseller = books_loo.transferred_from.bookseller | html %] > [% timestamp = books_loo.transferred_from.timestamp | html %] > <p>Transferred from basket: >- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"> [% basket.basketname | html %]</a> >- (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | html %]">[% bookseller.name | html %]</a>) >+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a> >+ (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) > on <span title="[% timestamp | $KohaDates with_hours = 1 | html %]"> > [% timestamp | $KohaDates %] > </span> >@@ -493,7 +493,7 @@ > [% IF ( active ) %] > [% UNLESS ( closedate ) %] > <td> >- <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | html %]&booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]">Modify</a> >+ <a href="neworderempty.pl?ordernumber=[% books_loo.ordernumber | uri %]&booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">Modify</a> > [% UNLESS (books_loo.order_received) %] > <br /> > <a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a> >@@ -503,10 +503,10 @@ > [% IF ( books_loo.left_holds_on_order ) %] > <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order | html %]) holds are linked with this order cancel holds first">Can't cancel order</span><br> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | html %]&biblionumber=[% books_loo.biblionumber | html %]&basketno=[% basketno | html %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | html %]" class="button">Cancel order</a><br> >+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order</a><br> > [% END %] > [% IF ( books_loo.can_del_bib ) %] >- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | html %]&biblionumber=[% books_loo.biblionumber | html %]&basketno=[% basketno | html %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | html %]" class="button">Cancel order and delete catalog record</a><br> >+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber | uri %]&biblionumber=[% books_loo.biblionumber | uri %]&basketno=[% basketno | uri %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno | uri %]" class="button">Cancel order and delete catalog record</a><br> > [% ELSE %] > <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br> > [% END %] >@@ -586,8 +586,8 @@ > [% bookseller = order.transferred_to.bookseller | html %] > [% timestamp = order.transferred_to.timestamp | html %] > <p>Transferred to basket: >- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"> [% basket.basketname | html %]</a> >- (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | html %]">[% bookseller.name | html %]</a>) >+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"> [% basket.basketname | html %]</a> >+ (<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% bookseller.id | uri %]">[% bookseller.name | html %]</a>) > on <span title="[% timestamp | $KohaDates with_hours = 1 | html %]"> > [% timestamp | $KohaDates %] > </span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index 9c81b71e55..827d7aaf68 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -130,9 +130,9 @@ function submitForm(form) { > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › > [% IF ( grouping ) %] >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> › <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | html %]">Basket grouping</a> › Add basket group for [% booksellername | html %]</div> >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> › <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | html %]">Basket grouping</a> › Add basket group for [% booksellername | html %]</div> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> › Basket grouping</div> >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> › Basket grouping</div> > [% END %] > > >@@ -153,11 +153,11 @@ function submitForm(form) { > </div> > [% END %] > [% IF (name && closedbg) %] >- <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a></h1> >+ <h1>Basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > [% ELSIF (name) %] >- <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a></h1> >+ <h1>Edit basket group [% name | html %] ([% basketgroupid | html %]) for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > [% ELSE %] >- <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a></h1> >+ <h1>Add basket group for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > [% END %] > <div id="basketgroupcolumns" class="row"> > [% UNLESS (closedbg) %] >@@ -171,7 +171,7 @@ function submitForm(form) { > [% IF ( baskets ) %] > [% FOREACH basket IN baskets %] > <li class="ungrouped" id="b-[% basket.basketno | html %]" > >- <a href="basket.pl?basketno=[% basket.basketno | html %]"> >+ <a href="basket.pl?basketno=[% basket.basketno | uri %]"> > [% IF ( basket.basketname ) %] > [% basket.basketname | html %] > [% ELSE %] >@@ -261,7 +261,7 @@ function submitForm(form) { > [% END %] > [% FOREACH selectedbasket IN selectedbaskets %] > <li class="grouped" id="b-[% selectedbasket.basketno | html %]" > >- <a href="basket.pl?basketno=[% selectedbasket.basketno | html %]"> >+ <a href="basket.pl?basketno=[% selectedbasket.basketno | uri %]"> > [% IF ( selectedbasket.basketname ) %] > [% selectedbasket.basketname | html %] > [% ELSE %] >@@ -287,7 +287,7 @@ function submitForm(form) { > <input type="hidden" name="basketgroupid" value="[% basketgroupid | html %]" /> > [% END %] > <input type="hidden" name="op" value="attachbasket" /> >- <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | html %]" class="cancel">Cancel</a> >+ <input type="submit" value="Save" /> <a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% booksellerid | uri %]" class="cancel">Cancel</a> > </fieldset> > [% END %] > </form> >@@ -295,7 +295,7 @@ function submitForm(form) { > </div> > [% ELSE %] > <div id="toolbar" class="btn-toolbar"> >- <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid | html %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div> >+ <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div> > </div> > <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > [% IF (NoEDIMessage) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >index e16ffd1d6e..26ff7cd854 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt >@@ -21,7 +21,7 @@ > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> › >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> › > [% IF ( add_form ) %] > [% IF ( basketno ) %]Edit basket '[% basketname | html %]' > [% ELSE %]Add a basket to [% booksellername | html %] >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..0d8e1b16e5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -45,9 +45,9 @@ > </p> > [% END %] > [% IF ( allbaskets ) %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | html %]&booksellerid=[% booksellerid | html %]">Show active baskets only</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&booksellerid=[% booksellerid | uri %]">Show active baskets only</a> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | html %]&booksellerid=[% booksellerid | html %]&allbaskets=1">Show all baskets</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier | uri %]&booksellerid=[% booksellerid | uri %]&allbaskets=1">Show all baskets</a> > [% END %] > [% UNLESS booksellerid %] > | <a href="#" id="show_active_vendors">Show active vendors only</a><a href="#" id="show_all_vendors">Show all vendors</a> >@@ -132,7 +132,7 @@ > [% IF basketgroup.closed %] > [% basketgroup.name | html %] (closed) > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basket.booksellerid | html %]&basketgroupid=[% basketgroup.id | html %]">[% basketgroup.name | html %]</a> >+ <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basket.booksellerid | uri %]&basketgroupid=[% basketgroup.id | uri %]">[% basketgroup.name | html %]</a> > [% END %] > [% END %] > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >index 667be18461..5af7d25d71 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt >@@ -9,8 +9,8 @@ > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% basket.bookseller.id | html %]">[% basket.bookseller.name | html %]</a> › >- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]">Basket [% basket.basketname | html %] ([% basket.basketno | html %]) for [% basket.bookseller.name | html %]</a> › >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% basket.bookseller.id | uri %]">[% basket.bookseller.name | html %]</a> › >+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">Basket [% basket.basketname | html %] ([% basket.basketno | html %]) for [% basket.bookseller.name | html %]</a> › > Cancel order > </div> > >@@ -58,7 +58,7 @@ > <p>The order has been cancelled, although the record has not been deleted.</p> > [% END %] > [% END %] >- <p><a href="[% referrer | html %]">OK</a></p> >+ <p><a href="[% referrer | uri %]">OK</a></p> > </div> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >index c730c7c577..5b52663852 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt >@@ -49,20 +49,20 @@ > <td><span title="[% msg.transfer_date | html %]">[% msg.transfer_date | $KohaDates %]</span></td> > <td>[% msg.status | html %]</td> > <td> >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% msg.vendor_id | html %]"> >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% msg.vendor_id | uri %]"> > [% msg.vendor.name | html %] > </a> > </td> > <td> > [% IF msg.message_type == 'QUOTE' || msg.message_type == 'ORDERS' %] > [% IF msg.basketno %] >- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% msg.basketno.basketno | html %]"> >+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% msg.basketno.basketno | uri %]"> > Basket: [% msg.basketno.basketno | html %] > </a> > [% END %] > [% ELSE %] > <!-- Assuming invoices --> >- <a href="/cgi-bin/koha/acqui/invoices.pl?message_id=[% msg.id | html %]"> >+ <a href="/cgi-bin/koha/acqui/invoices.pl?message_id=[% msg.id | uri %]"> > Invoices > </a> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >index a31fc8a7d9..284b07b5dd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt >@@ -159,26 +159,26 @@ > [% CASE 'cancelled' %]Cancelled > [% END %] > </td> >- <td>[% order.basketname | html %] (<a href="basket.pl?basketno=[% order.basketno | html %]">[% order.basketno | html %]</a>)</td> >+ <td>[% order.basketname | html %] (<a href="basket.pl?basketno=[% order.basketno | uri %]">[% order.basketno | html %]</a>)</td> > <td>[% order.authorisedbyname | html %]</td> > <td> > [% IF ( order.basketgroupid ) %] >- [% order.groupname | html %] (<a href="basketgroup.pl?op=add&booksellerid=[% order.id | html %]&basketgroupid=[% order.basketgroupid | html %]">[% order.basketgroupid | html %]</a>) >+ [% order.groupname | html %] (<a href="basketgroup.pl?op=add&booksellerid=[% order.id | uri %]&basketgroupid=[% order.basketgroupid | uri %]">[% order.basketgroupid | html %]</a>) > [% ELSE %] > > [% END %] > </td> > <td>[% IF ( order.invoicenumber ) %] >- <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% order.invoiceid | html %]">[% order.invoicenumber | html %]</a> >+ <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a> > [% ELSE %] > > [% END %] > </td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | html %]">[% order.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title | html %]</a> > <br />[% order.author | html %] <br /> [% order.isbn | html %] > </td> >- <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | html %]">[% order.name | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.id | uri %]">[% order.name | html %]</a></td> > <td><span title="[% order.creationdate | html %]">[% order.creationdate | $KohaDates %]</span></td> > <td> > [% IF order.datereceived %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >index ed32bc4fc1..977da717b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice-files.tt >@@ -20,7 +20,7 @@ > <main> > > <h2>Files for invoice: [% invoicenumber | html %]</h2> >- <p><b>Vendor: </b><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% suppliername | html %]</a></p> >+ <p><b>Vendor: </b><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p> > <br /> > [% IF errors %] > <div class="dialog alert"> >@@ -45,7 +45,7 @@ > <tbody> > [% FOREACH f IN files %] > <tr> >- <td><a href="?invoiceid=[% invoiceid | html %]&op=download&view=1&file_id=[% f.file_id | html %]">[% f.file_name | html %]</a></td> >+ <td><a href="?invoiceid=[% invoiceid | uri %]&op=download&view=1&file_id=[% f.file_id | uri %]">[% f.file_name | html %]</a></td> > <td>[% f.file_type | html %]</td> > <td>[% f.file_description | html %]</td> > <td class="title-string"> >@@ -53,7 +53,7 @@ > </td> > <td>[% f.file_size | html %]</td> > <td><a class="delete_file" href="?invoiceid=[% invoiceid | html %]&op=delete&file_id=[% f.file_id | html %]">Delete</a></td> >- <td><a href="?invoiceid=[% invoiceid | html %]&op=download&file_id=[% f.file_id | html %]">Download</a></td> >+ <td><a href="?invoiceid=[% invoiceid | uri %]&op=download&file_id=[% f.file_id | uri %]">Download</a></td> > </tr> > [% END %] > </tbody> >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..80ffad3673 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -30,7 +30,7 @@ > [% END %] > <h1>Invoice: [% invoicenumber | html %]</h1> > >- <p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% suppliername | html %]</a></p> >+ <p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% suppliername | html %]</a></p> > <form action="/cgi-bin/koha/acqui/invoice.pl" method="post" class="validated"> > <fieldset class="rows"> > <ol> >@@ -80,7 +80,7 @@ > <fieldset class="action"> > <input type="submit" value="Save" /> > [% UNLESS orders_loop.size %] >- <a href="invoice.pl?op=delete&invoiceid=[% invoiceid | html %]" id="delete">Delete</a> >+ <a href="invoice.pl?op=delete&invoiceid=[% invoiceid | uri %]" id="delete">Delete</a> > [% END %] > </fieldset> > </fieldset> >@@ -227,8 +227,8 @@ > </fieldset> > </form> > <p> >- <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]">Go to receipt page</a> >- [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | html %]">Manage invoice files</a>[% END %] >+ <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]">Go to receipt page</a> >+ [% IF Koha.Preference('AcqEnableFiles') %]| <a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]">Manage invoice files</a>[% END %] > </p> > <h2>Invoice details</h2> > <fieldset> >@@ -258,7 +258,7 @@ > <tr> > <td> > [% IF order.biblionumber %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | html %]">[% order.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title | html %]</a> > [% IF ( order.author ) %] > <br /><em>by</em> [% order.author | html %] > [% END %] >@@ -348,7 +348,7 @@ > <tbody> > [% FOREACH f IN files %] > <tr> >- <td><a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | html %]&op=download&view=1&file_id=[% f.file_id | html %]">[% f.file_name | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acqui/invoice-files.pl?invoiceid=[% invoiceid | uri %]&op=download&view=1&file_id=[% f.file_id | uri %]">[% f.file_name | html %]</a></td> > <td>[% f.file_type | html %]</td> > <td>[% f.file_description | html %]</td> > <td class="title-string"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >index 81293f54ba..d1e4ba844e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt >@@ -48,8 +48,8 @@ > <tr data-invoiceid="[% invoice.invoiceid | html %]" data-booksellerid="[% invoice.booksellerid | html %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost | html %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid | html %]" data-closedate="[% invoice.closedate | $KohaDates %]"> > <td>[% invoice.is_linked_to_subscriptions | html %]</td> > <td><input type="checkbox" class="select-invoice" value="[% invoice.invoiceid | html %]" /></td> >- <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | html %]">[% invoice.invoicenumber | html %]</a></td> >- <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | html %]">[% invoice.suppliername | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]">[% invoice.invoicenumber | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% invoice.booksellerid | uri %]">[% invoice.suppliername | html %]</a></td> > <td> > [% IF invoice.shipmentdate %] > <span title="[% invoice.shipmentdate | html %]">[% invoice.shipmentdate | $KohaDates %]</span> >@@ -80,14 +80,14 @@ > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="invoiceactions[% invoice.invoiceid | html %]"> >- <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | html %]"><i class="fa fa-search"></i> Details</a></li> >+ <li><a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoice.invoiceid | uri %]"><i class="fa fa-search"></i> Details</a></li> > [% IF invoice.closedate %] >- <li><a href="invoice.pl?op=reopen&invoiceid=[% invoice.invoiceid | html %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | html %]%26supplier=[% booksellerid | html %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | html %]%26title=[% title | html %]%26author=[% author | html %]%26publisher=[% publisher | html %]%26publicationyear=[% publicationyear | html %]%26branch=[% branch | html %]"><i class="fa fa-refresh"></i> Reopen</a></li> >+ <li><a href="invoice.pl?op=reopen&invoiceid=[% invoice.invoiceid | uri %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-refresh"></i> Reopen</a></li> > [% ELSE %] >- <li><a href="invoice.pl?op=close&invoiceid=[% invoice.invoiceid | html %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | html %]%26supplier=[% booksellerid | html %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | html %]%26title=[% title | html %]%26author=[% author | html %]%26publisher=[% publisher | html %]%26publicationyear=[% publicationyear | html %]%26branch=[% branch | html %]"><i class="fa fa-times-circle"></i> Close</a></li> >+ <li><a href="invoice.pl?op=close&invoiceid=[% invoice.invoiceid | uri %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]"><i class="fa fa-times-circle"></i> Close</a></li> > [% END %] > [% UNLESS invoice.receivedbiblios || invoice.receiveditems %] >- <li><a href="invoice.pl?op=delete&invoiceid=[% invoice.invoiceid | html %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | html %]%26supplier=[% booksellerid | html %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | html %]%26title=[% title | html %]%26author=[% author | html %]%26publisher=[% publisher | html %]%26publicationyear=[% publicationyear | html %]%26branch=[% branch | html %]" class="delete_invoice"><i class="fa fa-trash"></i> Delete</a></li> >+ <li><a href="invoice.pl?op=delete&invoiceid=[% invoice.invoiceid | uri %]&referer=/cgi-bin/koha/acqui/invoices.pl%3Fop=do_search%26invoicenumber=[% invoicenumber | uri %]%26supplier=[% booksellerid | uri %]%26shipmentdatefrom=[% shipmentdatefrom | $KohaDates %]%26shipmentdateto=[% shipmentdateto | $KohaDates %]%26billingdatefrom=[% billingdatefrom | $KohaDates %]%26billingdateto=[% billingdateto | $KohaDates %]%26isbneanissn=[% isbneanissn | uri %]%26title=[% title | uri %]%26author=[% author | uri %]%26publisher=[% publisher | uri %]%26publicationyear=[% publicationyear | uri %]%26branch=[% branch | uri %]" class="delete_invoice"><i class="fa fa-trash"></i> Delete</a></li> > [% END %] > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >index 69faed47bb..ba7e8b9c7d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt >@@ -106,7 +106,7 @@ > </td> > <td> > [% IF ( CAN_user_acquisition_order_manage ) %] >- <a href="basket.pl?basketno=[% lateorder.basketno | html %]" title="basket">[% lateorder.basketname | html %] ([% lateorder.basketno | html %])</a> >+ <a href="basket.pl?basketno=[% lateorder.basketno | uri %]" title="basket">[% lateorder.basketname | html %] ([% lateorder.basketno | html %])</a> > [% ELSE %] > [% lateorder.basketname | html %] ([% lateorder.basketno | html %]) > [% END %] >@@ -114,7 +114,7 @@ > <td> > [% IF ( lateorder.basketgroupid ) %] > [% IF ( CAN_user_acquisition_group_manage ) %] >- <a href="basketgroup.pl?op=add&booksellerid=[% lateorder.supplierid | html %]&basketgroupid=[% lateorder.basketgroupid | html %]" title="basketgroup">[% lateorder.basketgroupname | html %] ([% lateorder.basketgroupid | html %])</a> >+ <a href="basketgroup.pl?op=add&booksellerid=[% lateorder.supplierid | uri %]&basketgroupid=[% lateorder.basketgroupid | uri %]" title="basketgroup">[% lateorder.basketgroupname | html %] ([% lateorder.basketgroupid | html %])</a> > [% ELSE %] > [% lateorder.basketgroupname | html %] ([% lateorder.basketgroupid | html %])</a> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >index 3fb8f2b0e4..29b62e332f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt >@@ -51,7 +51,7 @@ > [% FOREACH biblio IN resultsloop %] > <tr> > <td> >- <p><span class="title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | html %]">[% biblio.title | html %]</a></span> >+ <p><span class="title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></span> > [% FOREACH subtitle IN biblio.subtitles %] <span class="subtitle">[% subtitle.subfield | html %]</span>[% END %] > [% IF ( biblio.author ) %] by <span class="author">[% biblio.author | html %]</span>,[% END %]</p> > <p>[% IF ( biblio.isbn ) %] [% biblio.isbn | html %][% END %] >@@ -68,11 +68,11 @@ > [% biblio.copyrightdate | html %] > </td> > <td> >- <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | html %]&viewas=html" class="btn btn-default btn-xs previewMARC">View MARC</a> >+ <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | uri %]&viewas=html" class="btn btn-default btn-xs previewMARC">View MARC</a> > </td> > <td> >- <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&biblionumber=[% biblio.biblionumber | html %]" class="btn btn-default btn-xs" title="Order this one"> >- Place order >+ <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&biblionumber=[% biblio.biblionumber | uri %]" class="btn btn-default btn-xs" title="Order this one"> >+ Order > </a> > </td> > </tr> >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..c7d51f1c12 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -41,7 +41,7 @@ > [% IF ( basketbooksellernote ) %]<li><span class="label">Vendor note:</span> [% basketbooksellernote | html %]</li>[% END %] > [% IF ( basketcontractno ) %] > <li><span class="label">Contract number: </span>[% basketcontractno | html %]</li> >- <li><span class="label">Contract name:</span> <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% basketcontractno | html %]">[% basketcontractname | html %]</a></li> >+ <li><span class="label">Contract name:</span> <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% basketcontractno | uri %]">[% basketcontractname | html %]</a></li> > [% END %] > [% IF ( authorisedbyname ) %]<li><span class="label">Managed by:</span> [% authorisedbyname | html %]</li>[% END %] > [% IF ( creationdate ) %]<li><span class="label">Open on:</span> [% creationdate | $KohaDates %]</li>[% END %] >@@ -99,7 +99,7 @@ > <legend> > Catalog details > [% IF ( biblionumber ) %] >- <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]"> Edit record</a></span> >+ <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]"> Edit record</a></span> > [% END %] > </legend> > [% UNLESS ( existing ) %] >@@ -241,7 +241,7 @@ > <ol> > <li> > <span class="label">Suggested by: </span> >- [% surnamesuggestedby | html %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby | html %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid | html %]&op=show">suggestion #[% suggestionid | html %]</a>) >+ [% surnamesuggestedby | html %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby | html %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid | uri %]&op=show">suggestion #[% suggestionid | html %]</a>) > </li> > </ol> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >index f235c09855..fbb2142aac 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt >@@ -45,7 +45,7 @@ > [% FOREACH sub IN subs_loop %] > <tr data-reneweddate="[% sub.reneweddate | html %]" > > <td>[% sub.issn | html %]</td> >- <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | html %]" class="button" title="subscription detail">[% IF (sub.title) %][% sub.title | html %][% ELSE %] >+ <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | uri %]" class="button" title="subscription detail">[% IF (sub.title) %][% sub.title | html %][% ELSE %] > --- > [% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %]</a> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >index 0ee5c9aa2c..b4a9314d5a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt >@@ -55,9 +55,9 @@ > </td> > <td class="actions"> > [% IF ( suggestions_loo.biblionumber ) %] >- <a href="neworderempty.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&suggestionid=[% suggestions_loo.suggestionid | html %]&biblio=[% suggestions_loo.biblionumber | html %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Place order</a> >+ <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&suggestionid=[% suggestions_loo.suggestionid | uri %]&biblio=[% suggestions_loo.biblionumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a> > [% ELSE %] >- <a href="neworderempty.pl?booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&suggestionid=[% suggestions_loo.suggestionid | html %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Place order</a> >+ <a href="neworderempty.pl?booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&suggestionid=[% suggestions_loo.suggestionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a> > [% END %] > </td> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >index 179ba33bb7..8e1699ca5b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt >@@ -40,19 +40,19 @@ > [% FOREACH order IN ordered %] > <tr> > <td class="cell"> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | html %]"> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]"> > [% order.title | html %] > </a> > </td> > <td class="cell"> > [% IF ( CAN_user_acquisition_order_manage ) %] >- <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber | html %]&booksellerid=[% order.booksellerid | html %]&basketno=[% order.basketno | html %]">[% order.ordernumber | html %]</a> >+ <a href="/cgi-bin/koha/acqui/neworderempty.pl?ordernumber=[% order.ordernumber | uri %]&booksellerid=[% order.booksellerid | uri %]&basketno=[% order.basketno | uri %]">[% order.ordernumber | html %]</a> > [% ELSE %] > [% order.ordernumber | html %] > [% END %] > </td> > <td class="cell"> >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.vendorname | html %]</a> >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a> > </td> > <td class="cell"> > [% ItemTypes.GetDescription( order.itype ) | html %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >index 39ee661680..7cfe2e89ce 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt >@@ -48,7 +48,7 @@ > <ol> > <li> > <span class="label">Suggested by: </span> >- [% surnamesuggestedby | html %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby | html %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid | html %]&op=show">suggestion #[% suggestionid | html %]</a>) >+ [% surnamesuggestedby | html %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby | html %][% END %] (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% suggestionid | uri %]&op=show">suggestion #[% suggestionid | html %]</a>) > </li> > </ol> > </fieldset> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 7b3e958045..8ad123b846 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -130,17 +130,17 @@ > <tbody class="filterclass"> > [% FOREACH loop_order IN loop_orders %] > <tr> >- <td class="basketfilterclass">[% loop_order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno | html %]">[% loop_order.basketno | html %]</a>)</td> >+ <td class="basketfilterclass">[% loop_order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% loop_order.basketno | uri %]">[% loop_order.basketno | html %]</a>)</td> > <td> > [% IF loop_order.basketgroupid %] >- [% loop_order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_order.booksellerid | html %]">[% loop_order.basketgroupid | html %]</a>) >+ [% loop_order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% loop_order.booksellerid | uri %]">[% loop_order.basketgroupid | html %]</a>) > [% ELSE %] > No basket group > [% END %] > </td> >- <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber | html %]&booksellerid=[% loop_order.booksellerid | html %]">[% loop_order.ordernumber | html %]</a></td> >+ <td class="orderfilterclass"><a href="neworderempty.pl?ordernumber=[% loop_order.ordernumber | uri %]&booksellerid=[% loop_order.booksellerid | uri %]">[% loop_order.ordernumber | html %]</a></td> > <td class="summaryfilterclass"> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber | html %]">[% loop_order.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loop_order.biblionumber | uri %]">[% loop_order.title | html %]</a> > [% IF ( loop_order.author ) %] by [% loop_order.author | html %][% END %] > [% IF ( loop_order.isbn ) %] – [% loop_order.isbn | html %][% END %] > [% IF ( loop_order.publishercode ) %] >@@ -152,24 +152,24 @@ > [% IF ( loop_order.suggestionid ) %] > <br/> > Suggested by: [% loop_order.surnamesuggestedby | html %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby | html %] [% END %] >- (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid | html %]&op=show">suggestion #[% loop_order.suggestionid | html %]</a>) >+ (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% loop_order.suggestionid | uri %]&op=show">suggestion #[% loop_order.suggestionid | html %]</a>) > [% END %] > <br /> > [% IF ( loop_order.order_internalnote ) %] >- <p class="ordernote"><strong>Internal note: </strong>[% loop_order.order_internalnote | html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber | html %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | html %]&type=internal">Change internal note</a>]</p> >+ <p class="ordernote"><strong>Internal note: </strong>[% loop_order.order_internalnote | html %] [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber | uri %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]&type=internal">Change internal note</a>]</p> > [% ELSE %] >- [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber | html %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | html %]&type=internal">Add internal note</a>] >+ [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber | uri %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]&type=internal">Add internal note</a>] > [% END %] > [% IF ( loop_order.order_vendornote ) %] > <p class="ordernote"><strong>Vendor note: </strong>[% loop_order.order_vendornote | html %]</p> > [% ELSE %] >- [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber | html %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | html %]&type=vendor">Add vendor note</a>] >+ [<a href="/cgi-bin/koha/acqui/modordernotes.pl?ordernumber=[% loop_order.ordernumber | uri %]&referrer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]&type=vendor">Add vendor note</a>] > [% END %] > </td> > <td> >- <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber | html %]" class="previewData">Order</a><br> >- <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber | html %]" class="previewData">MARC</a><br> >- <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_order.biblionumber | html %]" class="previewData">Card</a> >+ <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% loop_order.ordernumber | uri %]" class="previewData">Order</a><br> >+ <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber | uri %]" class="previewData">MARC</a><br> >+ <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_order.biblionumber | uri %]" class="previewData">Card</a> > </td> > <td>[% loop_order.replacementprice | $Price %]</td> > <td>[% loop_order.quantity | html %]</td> >@@ -177,7 +177,7 @@ > <td>[% loop_order.total | $Price %]</td> > <td>[% loop_order.budget_name | html %]</td> > <td> >- <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber | html %]&invoiceid=[% invoiceid | html %]">Receive</a> >+ <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber | uri %]&invoiceid=[% invoiceid | uri %]">Receive</a> > <br /> > <a href="#" onclick="transfer_order_popup([% loop_order.ordernumber | html %]); return false;">Transfer</a> > </td> >@@ -185,10 +185,10 @@ > [% IF ( loop_order.left_holds_on_order ) %] > <span class="button" title="Can't cancel order, ([% loop_order.holds_on_order | html %]) holds are linked with this order cancel holds first">Can't cancel order</span><br> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber | html %]&biblionumber=[% loop_order.biblionumber | html %]&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order</a><br /> >+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber | uri %]&biblionumber=[% loop_order.biblionumber | uri %]&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order</a><br /> > [% END %] > [% IF ( loop_order.can_del_bib ) %] >- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber | html %]&biblionumber=[% loop_order.biblionumber | html %]&del_biblio=1&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order and catalog record</a><br /> >+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber | uri %]&biblionumber=[% loop_order.biblionumber | uri %]&del_biblio=1&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order and catalog record</a><br /> > [% ELSE %] > <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br> > [% END %] >@@ -214,7 +214,7 @@ > [% ELSE %] > <p> > Invoice is closed, so you can't receive orders anymore. >- <a href="/cgi-bin/koha/acqui/invoice.pl?op=reopen&invoiceid=[% invoiceid | html %]&referer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | html %]">Reopen it</a>. >+ <a href="/cgi-bin/koha/acqui/invoice.pl?op=reopen&invoiceid=[% invoiceid | uri %]&referer=/cgi-bin/koha/acqui/parcel.pl%3Finvoiceid=[% invoiceid | uri %]">Reopen it</a>. > </p> > [% END %] > >@@ -277,34 +277,34 @@ > <tbody class="filterclass"> > [% FOREACH order IN loop_received %] > <tr> >- <td>[% order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basketno | html %]">[% order.basketno | html %]</a>)</td> >+ <td>[% order.basketname | html %] (<a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% order.basketno | uri %]">[% order.basketno | html %]</a>)</td> > <td> > [% IF order.basketgroupid %] >- [% order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% order.booksellerid | html %]">[% order.basketgroupid | html %]</a>) >+ [% order.basketgroupname | html %] (<a href="/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=[% order.booksellerid | uri %]">[% order.basketgroupid | html %]</a>) > [% ELSE %] > No basket group > [% END %] > </td> > <td> >- <a href="neworderempty.pl?ordernumber=[% order.ordernumber | html %]&booksellerid=[% booksellerid | html %]">[% order.ordernumber | html %]</a> >+ <a href="neworderempty.pl?ordernumber=[% order.ordernumber | uri %]&booksellerid=[% booksellerid | uri %]">[% order.ordernumber | html %]</a> > [% IF (order.parent_ordernumber && (order.parent_ordernumber != order.ordernumber)) %] >- (<a href="neworderempty.pl?ordernumber=[% order.parent_ordernumber | html %]&booksellerid=[% booksellerid | html %]" title="Original order line">[% order.parent_ordernumber | html %]</a>) >+ (<a href="neworderempty.pl?ordernumber=[% order.parent_ordernumber | uri %]&booksellerid=[% booksellerid | uri %]" title="Original order line">[% order.parent_ordernumber | html %]</a>) > [% END %] > </td> > <td> > [% IF order.total_holds > 0 %] > [% IF order.item_holds > 0 %] >- <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% order.biblionumber | html %]">[% order.item_holds | html %]</a></span> >+ <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% order.biblionumber | uri %]">[% order.item_holds | html %]</a></span> > [% ELSE %] > 0 > [% END %] > / >- <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% order.biblionumber | html %]">[% order.total_holds | html %]</a></span> >+ <span class="error"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% order.biblionumber | uri %]">[% order.total_holds | html %]</a></span> > [% ELSE %] > 0 > [% END %] > </td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | html %]">[% order.title | html %]</a> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]">[% order.title | html %]</a> > [% IF ( order.author ) %] / [% order.author | html %][% END %] > [% IF ( order.isbn ) %] - [% order.isbn | html %][% END %] > [% IF ( order.publishercode ) %] >@@ -316,13 +316,13 @@ > [% IF ( order.suggestionid ) %] > <br/> > Suggested by: [% order.surnamesuggestedby | html %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby | html %] [% END %] >- (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid | html %]&op=show">suggestion #[% order.suggestionid | html %]</a>) >+ (<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid | uri %]&op=show">suggestion #[% order.suggestionid | html %]</a>) > [% END %] > </td> > <td> >- <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber | html %]" class="previewData">Order</a><br> >- <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber | html %]" class="previewData">MARC</a><br> >- <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% order.biblionumber | html %]" class="previewData">Card</a> >+ <a href="/cgi-bin/koha/acqui/showorder.pl?ordernumber=[% order.ordernumber | uri %]" class="previewData">Order</a><br> >+ <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber | uri %]" class="previewData">MARC</a><br> >+ <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% order.biblionumber | uri %]" class="previewData">Card</a> > </td> > <td>[% order.replacementprice | $Price %]</td> > <td>[% order.quantityreceived | html %]</td> >@@ -351,7 +351,7 @@ > Can't cancel receipt > </span> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]&op=cancelreceipt&ordernumber=[% order.ordernumber | html %]">Cancel receipt</a> >+ <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]&op=cancelreceipt&ordernumber=[% order.ordernumber | uri %]">Cancel receipt</a> > [% END %] > </td> > </tr> >@@ -381,7 +381,7 @@ > </div> > > [% IF (invoiceclosedate) %] >- <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid | html %]">View invoice</a> >+ <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% invoiceid | uri %]">View invoice</a> > [% ELSE %] > <form action="/cgi-bin/koha/acqui/invoice.pl" method="get"> > <input type="hidden" name="invoiceid" value="[% invoiceid | html %]" /> >@@ -430,7 +430,7 @@ > <input type="hidden" value="search" name="op" /> > <input type="hidden" value="[% invoiceid | html %]" name="invoiceid" /> > <input type="submit" value="Filter" /> >- <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | html %]">Clear</a> >+ <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoiceid | uri %]">Clear</a> > </fieldset> > </fieldset> > </form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >index 412f4f759f..a9d93678f2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt >@@ -28,7 +28,7 @@ > <p>An error has occurred. Invoice cannot be created.</p> > </div> > [% END %] >-<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% name | html %]</a></h1> >+<h1>Receive shipment from vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a></h1> > > [% IF duplicate_invoices %] > <div id="parcels_duplicate_invoice" class="dialog alert"> >@@ -40,7 +40,7 @@ > <tr> > <td>[% invoice.invoicenumber | html %]</td> > <td>[% invoice.shipmentdate | $KohaDates %]</td> >- <td><a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoice.invoiceid | html %]">Receive</a></td> >+ <td><a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% invoice.invoiceid | uri %]">Receive</a></td> > </tr> > [% END %] > </tbody> >@@ -86,7 +86,7 @@ > </td> > <td> > [% IF ( searchresult.code ) %] >- <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% searchresult.invoiceid | html %]">[% searchresult.code | html %]</a> >+ <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% searchresult.invoiceid | uri %]">[% searchresult.code | html %]</a> > [% ELSE %] > <abbr title="not available">n/a</abbr> > [% END %] >@@ -108,17 +108,17 @@ > <div id="resultnumber"> > <!-- Row of numbers corresponding to search result pages --> > [% IF ( displayprev ) %] >- <a href="parcels.pl?booksellerid=[% booksellerid | html %]&startfrom=[% prevstartfrom | html %][% IF ( datefrom ) %]&datefrom=[% datefrom | html %][% END %][% IF ( dateto ) %]&dateto=[% dateto | html %][% END %][% IF ( code ) %]&filter=[% code | html %][% END %][% IF ( orderby ) %]&orderby=[% orderby | html %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage | html %][% END %]&type=intra"><< Previous</a> >+ <a href="parcels.pl?booksellerid=[% booksellerid | uri %]&startfrom=[% prevstartfrom | uri %][% IF ( datefrom ) %]&datefrom=[% datefrom | uri %][% END %][% IF ( dateto ) %]&dateto=[% dateto | uri %][% END %][% IF ( code ) %]&filter=[% code | uri %][% END %][% IF ( orderby ) %]&orderby=[% orderby | uri %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage | uri %][% END %]&type=intra"><< Previous</a> > [% END %] > [% FOREACH number IN numbers %] > [% IF ( number.highlight ) %] > <span class="current">[% number.number | html %]</span> > [% ELSE %] >- <a href="parcels.pl?booksellerid=[% booksellerid | html %]&startfrom=[% number.startfrom | html %][% IF ( number.datefrom ) %]&datefrom=[% number.datefrom | html %][% END %][% IF ( number.dateto ) %]&dateto=[% number.dateto | html %][% END %][% IF ( number.code ) %]&filter=[% number.code | html %][% END %][% IF ( number.orderby ) %]&orderby=[% number.orderby | html %][% END %][% IF ( number.resultsperpage ) %]&resultsperpage=[% number.resultsperpage | html %][% END %]&type=intra">[% number.number | html %]</a> >+ <a href="parcels.pl?booksellerid=[% booksellerid | uri %]&startfrom=[% number.startfrom | uri %][% IF ( number.datefrom ) %]&datefrom=[% number.datefrom | uri %][% END %][% IF ( number.dateto ) %]&dateto=[% number.dateto | uri %][% END %][% IF ( number.code ) %]&filter=[% number.code | uri %][% END %][% IF ( number.orderby ) %]&orderby=[% number.orderby | uri %][% END %][% IF ( number.resultsperpage ) %]&resultsperpage=[% number.resultsperpage | uri %][% END %]&type=intra">[% number.number | html %]</a> > [% END %] > [% END %] > [% IF ( displaynext ) %] >- <a href="parcels.pl?booksellerid=[% booksellerid | html %]&startfrom=[% nextstartfrom | html %][% IF ( datefrom ) %]&datefrom=[% datefrom | html %][% END %][% IF ( dateto ) %]&dateto=[% dateto | html %][% END %][% IF ( code ) %]&filter=[% code | html %][% END %][% IF ( orderby ) %]&orderby=[% orderby | html %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage | html %][% END %]&type=intra">Next >></a> >+ <a href="parcels.pl?booksellerid=[% booksellerid | uri %]&startfrom=[% nextstartfrom | uri %][% IF ( datefrom ) %]&datefrom=[% datefrom | uri %][% END %][% IF ( dateto ) %]&dateto=[% dateto | uri %][% END %][% IF ( code ) %]&filter=[% code | uri %][% END %][% IF ( orderby ) %]&orderby=[% orderby | uri %][% END %][% IF ( resultsperpage ) %]&resultsperpage=[% resultsperpage | uri %][% END %]&type=intra">Next >></a> > [% END %] > </div> > </div> >@@ -202,7 +202,7 @@ > <option value="100">100</option> > </select></li> > </ol> >- <fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | html %]">Clear</a></fieldset> >+ <fieldset class="action"><input type="submit" class="button" value="Filter" /> <a href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% booksellerid | uri %]">Clear</a></fieldset> > </fieldset> > </form> > </aside> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >index 67289b1379..0797760990 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt >@@ -42,7 +42,7 @@ > [% FOREACH order IN spent %] > <tr> > <td class="cell"> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | html %]"> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber | uri %]"> > [% order.title | html %] > </a> > </td> >@@ -50,10 +50,10 @@ > [% order.ordernumber | html %] > </td> > <td class="cell"> >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | html %]">[% order.vendorname | html %]</a> >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a> > </td> > <td class="cell"> >- <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | html %]">[% order.invoicenumber | html %]</a> >+ <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a> > </td> > <td class="cell"> > [% ItemTypes.GetDescription( order.itype ) | html %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 3066c1cd09..7cc6bf1951 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -65,7 +65,7 @@ > <p><span class="label">Alternative phone: </span>[% contact.altphone | html %]</p> > <p><span class="label">Fax: </span>[% contact.fax | html %]</p> > [% IF ( contact.email ) %] >- <p><span class="label">Email: </span><a href="mailto:[% contact.email | html %]">[% contact.email | html %]</a></p> >+ <p><span class="label">Email: </span><a href="mailto:[% contact.email | uri %]">[% contact.email | html %]</a></p> > [% END %] > [% IF ( contact.notes ) %] > <p><span class="label">Notes: </span>[% contact.notes | html %]</p> >@@ -264,7 +264,7 @@ > <p><span class="label">Phone: </span>[% phone | html %]</p> > <p><span class="label">Fax: </span>[% fax | html %]</p> > [% IF ( url ) %] >- <p><span class="label">Website: </span><a href="[% url | html %]">[% url | html %]</a></p> >+ <p><span class="label">Website: </span><a href="[% url | uri %]">[% url | html %]</a></p> > [% END %] > [% IF ( accountnumber ) %] > <p><span class="label">Account number: </span>[% accountnumber | html %]</p> >@@ -334,7 +334,7 @@ > [% FOREACH contract IN contracts %] > <tr> > <td> >- <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber | html %]&booksellerid=[% contract.booksellerid | html %]">[% contract.contractname | html %]</a> >+ <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&contractnumber=[% contract.contractnumber | uri %]&booksellerid=[% contract.booksellerid | uri %]">[% contract.contractname | html %]</a> > </td> > <td>[% contract.contractdescription | html %]</td> > <td><span title="[% contract.contractstartdate | html %]">[% contract.contractstartdate | $KohaDates %]</span></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >index 94849e9cab..3870d2fd77 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >@@ -73,9 +73,9 @@ > <tbody> > [% FOREACH ordersloo IN ordersloop %] > <tr> >- <td><a href="neworderempty.pl?ordernumber=[% ordersloo.ordernumber | html %]">[% ordersloo.ordernumber | html %]</a></td> >+ <td><a href="neworderempty.pl?ordernumber=[% ordersloo.ordernumber | uri %]">[% ordersloo.ordernumber | html %]</a></td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | html %]">[% ordersloo.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | uri %]">[% ordersloo.title | html %]</a> > [% IF ( ordersloo.author ) %] by [% ordersloo.author | html %][% END %] > [% IF ( ordersloo.isbn ) %] – [% ordersloo.isbn | html %][% END %] > [% IF ( ordersloo.publishercode ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >index 1401d40b88..425176e5e6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -25,7 +25,7 @@ > <META HTTP-EQUIV=Refresh CONTENT="[% metacontent | html %]"> > [% ELSE %] > [% IF ( booksellername ) %] >- <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a></h1> >+ <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1> > <h2>Contact information</h2> > <p><strong>Address: </strong> > [% booksellerpostal | html %] >@@ -33,7 +33,7 @@ > [% bookselleraddress2 | html %] > [% bookselleraddress3 | html %] > [% bookselleraddress4 | html %] >- <a href="[% booksellerurl | html %]">[% booksellerurl | html %]</a> >+ <a href="[% booksellerurl | uri %]">[% booksellerurl | html %]</a> > </p> > <p><strong>Phone: </strong> > [% booksellerphone | html %] / Fax: >@@ -92,7 +92,7 @@ > [% uncertainpriceorder.basketname | html %] > </td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% uncertainpriceorder.biblionumber | html %]">[% uncertainpriceorder.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% uncertainpriceorder.biblionumber | uri %]">[% uncertainpriceorder.title | html %]</a> > [% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author | html %][% END %] > [% IF ( uncertainpriceorder.publishercode ) %] > <br /><em>Publisher:</em> [% uncertainpriceorder.publishercode | html %] >@@ -102,7 +102,7 @@ > [% END %] > [% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn | html %][% END %] > <br /> >- <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber | html %]&booksellerid=[% booksellerid | html %]&basketno=[% uncertainpriceorder.basketno | html %]"> >+ <a href="neworderempty.pl?ordernumber=[% uncertainpriceorder.ordernumber | uri %]&booksellerid=[% booksellerid | uri %]&basketno=[% uncertainpriceorder.basketno | uri %]"> > Edit > </a> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >index ac2c906ca3..4e2959841b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >@@ -116,7 +116,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > [% IF ( breeding_loo.breedingid ) %] > > <tr> >- <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid | html %]&booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">Place order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td> >+ <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid | html %]&booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td> > <td>[% breeding_loo.title | html %]</td> > <td>[% breeding_loo.author | html %]</td> > <td>[% breeding_loo.isbn | html %]</td> >@@ -133,8 +133,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > </dl> > </td> > [% END %] >- <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | html %]" title="MARC" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid | html %]" title="Card" class="previewData">Card</a></td> >- <td><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid | html %]&booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">Place order</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid | html %]" title="Card" class="previewData">Card</a></td> >+ <td><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid | uri %]&booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]">Order</a></td> > > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >index cf7d6b3a52..98a2e036ee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -10,7 +10,7 @@ > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetmenu_[% block_budget.budget_period_id | html %]"> > <li> >- <a href="[% script_name | html %]?op=add_form&budget_period_id=[% block_budget.budget_period_id | html %]"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="[% script_name | uri %]?op=add_form&budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-pencil"></i> Edit</a> > </li> > [% IF block_budget.count %] > <li class="disabled"> >@@ -18,17 +18,17 @@ > </li> > [% ELSE %] > <li> >- <a href="[% script_name | html %]?op=delete_confirm&budget_period_id=[% block_budget.budget_period_id | html %]"><i class="fa fa-trash"></i> Delete</a> >+ <a href="[% script_name | uri %]?op=delete_confirm&budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-trash"></i> Delete</a> > </li> > [% END %] > <li> >- <a href="[% script_name | html %]?op=duplicate_form&budget_period_id=[% block_budget.budget_period_id | html %]"><i class="fa fa-copy"></i> Duplicate</a> >+ <a href="[% script_name | uri %]?op=duplicate_form&budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-copy"></i> Duplicate</a> > </li> > <li> >- <a href="[% script_name | html %]?op=close_form&budget_period_id=[% block_budget.budget_period_id | html %]"><i class="fa fa-times-circle"></i> Close</a> >+ <a href="[% script_name | uri %]?op=close_form&budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-times-circle"></i> Close</a> > </li> > <li> >- <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=[% block_budget.budget_period_id | html %]"><i class="fa fa-plus"></i> Add fund</a> >+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-plus"></i> Add fund</a> > </li> > </ul> > </div> >@@ -103,11 +103,11 @@ > [% END %] > [% IF close_form %] > <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> › >- <span>Close budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">[% budget_period_description | html %]</a></span> >+ <span>Close budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">[% budget_period_description | html %]</a></span> > [% END %] > [% IF closed %] > <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> › >- <span>Budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">[% budget_period_description | html %]</a> closed</span> >+ <span>Budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">[% budget_period_description | html %]</a> closed</span> > [% END %] > [% IF ( else ) %] > <span>Budgets administration</span> >@@ -254,7 +254,7 @@ > <!-- ###################################### --> > <input type="submit" value="Save" /> > [% IF ( budget_period_id ) %] >- <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]" class="cancel">Cancel</a> >+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]" class="cancel">Cancel</a> > [% ELSE %] > <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a> > [% END %] >@@ -309,7 +309,7 @@ > <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Back</a> > [% ELSE %] > <h3>The unreceived orders from the following funds will be moved</h3> >- Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">[% budget_period_description | html %]</a>: >+ Fund list of budget <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">[% budget_period_description | html %]</a>: > <table id="budgeth"> > <thead> > <tr> >@@ -437,7 +437,7 @@ > <tbody> > [% FOREACH period_active IN period_active_loop %] > <tr> >- <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id | html %]" title="View funds for [% period_active.budget_period_description | html %]">[% period_active.budget_period_description | html %]</a></td> >+ <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_active.budget_period_id | uri %]" title="View funds for [% period_active.budget_period_description | html %]">[% period_active.budget_period_description | html %]</a></td> > <td><span title="[% period_active.budget_period_startdate | html %]">[% period_active.budget_period_startdate | $KohaDates %]</span></td> > <td><span title="[% period_active.budget_period_enddate | html %]">[% period_active.budget_period_enddate | $KohaDates %]</span></td> > <td> >@@ -473,7 +473,7 @@ > <tbody> > [% FOREACH period_loo IN period_inactive_loop %] > <tr> >- <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id | html %]" title="View funds for [% period_loo.budget_period_description | html %]">[% period_loo.budget_period_description | html %]</a></td> >+ <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id | uri %]" title="View funds for [% period_loo.budget_period_description | html %]">[% period_loo.budget_period_description | html %]</a></td> > <td><span title="[% period_loo.budget_period_startdate | html %]">[% period_loo.budget_period_startdate | $KohaDates %]</span></td> > <td><span title="[% period_loo.budget_period_enddate | html %]">[% period_loo.budget_period_enddate | $KohaDates %]</span></td> > <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span> [% ELSE %][% END %] </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >index 28792b7367..82a27eb2fe 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -18,7 +18,7 @@ > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> › [% IF op == 'list' %][% IF budget_period_id %]Funds for '[% budget_period_description | html %]'[% ELSE %]All funds[% END %][% END %] > [% IF op == 'add_form' %] >- <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">Funds</a> › [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name | html %]'[% END %][% ELSE %]Add fund[% END %] >+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a> › [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name | html %]'[% END %][% ELSE %]Add fund[% END %] > [% END %] > [% IF op == 'delete_confirm' %] > <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a> › Delete fund? >@@ -176,13 +176,13 @@ > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetactions[% budget.budget_id | html %]_[% budget.budget_period_id | html %]"> >- <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=[% budget.budget_id | html %]&budget_period_id=[% budget.budget_period_id | html %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=[% budget.budget_id | uri %]&budget_period_id=[% budget.budget_period_id | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> > [% IF budget.budget_has_children %] > <li class="disabled"><a href="#" class="deletefund-disabled" data-toggle="tooltip" data-placement="left" title="This fund has children"><i class="fa fa-trash"></i> Delete</a></li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=delete_confirm&budget_id=[% budget.budget_id | html %]&budget_period_id=[% budget.budget_period_id | html %]"><i class="fa fa-trash"></i> Delete</a></li> >+ <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=delete_confirm&budget_id=[% budget.budget_id | uri %]&budget_period_id=[% budget.budget_period_id | uri %]"><i class="fa fa-trash"></i> Delete</a></li> > [% END %] >- <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_parent_id=[% budget.budget_id | html %]&budget_period_id=[% budget.budget_period_id | html %]"><i class="fa fa-plus"></i> Add child fund</a></li> >+ <li><a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_parent_id=[% budget.budget_id | uri %]&budget_period_id=[% budget.budget_period_id | uri %]"><i class="fa fa-plus"></i> Add child fund</a></li> > </ul> > </div> > </td> >@@ -251,7 +251,7 @@ > <span class="label">Owner: </span> > [% IF budget_owner %] > <span id="budget_owner_name"> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner.borrowernumber | html %]"> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner.borrowernumber | uri %]"> > [% budget_owner.firstname | html %] [% budget_owner.surname | html %] > </a> | > </span> >@@ -280,7 +280,7 @@ > <ul style="float:left;" id="budget_users"> > [% FOREACH user IN budget_users %] > <li id="user_[% user.borrowernumber | html %]"> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% user.borrowernumber | html %]"> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% user.borrowernumber | uri %]"> > [% user.firstname | html %] [% user.surname | html %] > </a> > • <a href="#" class="del_user" data-borrowernumber="[% user.borrowernumber | html %]"><i class="fa fa-trash"></i> Remove</a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >index b25ba7568f..94f55d9e48 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -24,25 +24,25 @@ > › > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> > › >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% booksellername | html %]</a> >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a> > › > [% IF ( add_form ) %] >- <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]">Contracts</a> >+ <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a> > › > [% IF ( contractnumber ) %]Modify contract '[% contractname | html %]' > [% ELSE %]New contract > [% END %] > [% END %] > [% IF ( add_validate ) %] >- <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]">Contracts</a> >+ <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a> > › Data recorded > [% END %] > [% IF ( delete_confirm ) %] >- <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]">Contracts</a> >+ <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a> > › Confirm deletion of contract [% contractnumber | html %] > [% END %] > [% IF ( delete_confirmed ) %] >- <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | html %]">Contracts</a> › Contract deleted >+ <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a> › Contract deleted > [% END %] > [% IF ( else ) %]Contracts[% END %] > </div> >@@ -151,14 +151,14 @@ > [% FOREACH loo IN loop %] > <tr> > <td> >- <a href="[% loo.script_name | html %]?op=add_form&booksellerid=[% loo.booksellerid | html %]&contractnumber=[% loo.contractnumber | html %]">[% loo.contractname | html %]</a> >+ <a href="[% loo.script_name | uri %]?op=add_form&booksellerid=[% loo.booksellerid | uri %]&contractnumber=[% loo.contractnumber | uri %]">[% loo.contractname | html %]</a> > </td> > <td>[% loo.contractdescription | html %]</td> > <td>[% loo.contractstartdate | html %]</td> > <td>[% loo.contractenddate | html %]</td> > <td class="actions"> >- <a href="[% loo.script_name | html %]?op=add_form&contractnumber=[% loo.contractnumber | html %]&booksellerid=[% loo.booksellerid | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a href="[% loo.script_name | html %]?op=delete_confirm&contractnumber=[% loo.contractnumber | html %]&booksellerid=[% loo.booksellerid | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a href="[% loo.script_name | uri %]?op=add_form&contractnumber=[% loo.contractnumber | uri %]&booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="[% loo.script_name | uri %]?op=delete_confirm&contractnumber=[% loo.contractnumber | uri %]&booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >@@ -167,7 +167,7 @@ > <div class="dialog message"> > There are no contracts with this vendor. > [% IF active %] >- <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid | html %]">Add a contract</a>. >+ <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid | uri %]">Add a contract</a>. > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >index 79c3dbac8c..7fff2ce4e7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -16,8 +16,8 @@ > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › > <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › > <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a> › >- <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | html %]">Funds</a> › >- <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | html %]">Planning</a> › >+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a> › >+ <a href="/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id | uri %]">Planning</a> › > </div> > > <div class="main container-fluid"> >@@ -75,7 +75,7 @@ > [% ELSE %] > <td> > [% END %] >- <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=[% budget_line.budget_id | html %]&budget_period_id=[% budget_period_id | html %]">[% budget_line.budget_name | html %]</a></td> >+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=[% budget_line.budget_id | uri %]&budget_period_id=[% budget_period_id | uri %]">[% budget_line.budget_name | html %]</a></td> > <td><span id="[% budget_line.budget_amount | html %]">[% budget_line.budget_amount | $Price %] </span> > > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >index f0fe0454e8..14bc1b5aa7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >@@ -15,7 +15,7 @@ > [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a> › > [% END %] > [% IF ( else ) %]Authority MARC subfield structure for [% tagfield | html %] >- [% ELSE %]<a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&tagsubfield=[% tagsubfield | html %]&authtypecode=[% authtypecode |uri %]">Authority MARC subfield structure for [% tagfield | html %]</a> › >+ [% ELSE %]<a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&tagsubfield=[% tagsubfield | uri %]&authtypecode=[% authtypecode |uri %]">Authority MARC subfield structure for [% tagfield | html %]</a> › > [% END %] > [% IF ( delete_confirm ) %]Confirm deletion of subfield [% tagsubfield | html %]?[% END %] > [% IF ( delete_confirmed ) %]Data deleted[% END %] >@@ -45,9 +45,9 @@ > <ul> > [% FOREACH loo IN loop %] > [% IF ( loo.new_subfield ) %] >- <li><a href="#sub[% loo.tagsubfield | html %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li> >+ <li><a href="#sub[% loo.tagsubfield | uri %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li> > [% ELSE %] >- <li><a href="#sub[% loo.tagsubfield | html %]field" title="[% loo.liblibrarian | html_entity %]"> >+ <li><a href="#sub[% loo.tagsubfield | uri %]field" title="[% loo.liblibrarian | html_entity %]"> > [% loo.tagsubfield | html %] > </a></li> > [% END %] >@@ -301,7 +301,7 @@ > [% IF ( loo.value_builder ) %] | <strong>Plugin:</strong>[% loo.value_builder | html %],[% END %] > [% END %] > </td> >- <td><a href="[% loo.delete | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a></td> >+ <td><a href="[% loo.delete | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a></td> > </tr> > [% END %] > </table> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >index 94b8d57444..cb57caf085 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >@@ -21,28 +21,28 @@ > [% IF ( add_form ) %] > [% IF ( use_heading_flags_p ) %] > [% IF ( heading_modify_tag_p ) %] >- [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | html %]">[% authtypecode | html %] Framework</a> >+ [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a> > [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a> > [% END %] › Modify tag > [% END %] > [% IF ( heading_add_tag_p ) %] >- [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | html %]">[% authtypecode | html %] framework</a> >+ [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a> > [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a> > [% END %] › New tag > [% END %] > [% ELSE %] >- [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | html %]">[% authtypecode | html %] Framework</a> >+ [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a> > [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a> > [% END %] › [% action | html %] > [% END %] > [% ELSE %] > [% IF ( delete_confirm ) %] >- [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | html %]">[% authtypecode | html %] framework</a> >+ [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a> > [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a> > [% END %] › Confirm deletion > [% ELSE %] > [% IF ( delete_confirmed ) %] >- [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | html %]">[% authtypecode | html %] framework</a> >+ [% IF ( authtypecode ) %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a> > [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a> > [% END %] › Data deleted > [% ELSE %] >@@ -114,7 +114,7 @@ > </fieldset> > <fieldset class="action"> > <input type="submit" value="Submit" /> >- <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | html %]" class="cancel">Cancel</a> >+ <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]" class="cancel">Cancel</a> > </fieldset> > </form> > [% END %] >@@ -213,9 +213,9 @@ > <a class="btn btn-default btn-xs dropdown-toggle" id="authtagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtagactions[% loo.tagfield | html %]"> >- <li><a href="[% loo.subfield_link | html %]"><i class="fa fa-eye"></i> Subfields</a></li> >- <li><a href="[% loo.edit | html %]"><i class="fa fa-pencil"></i> Edit</a></li> >- <li><a href="[% loo.delete | html %]"><i class="fa fa-trash"></i> Delete</a></li> >+ <li><a href="[% loo.subfield_link | uri %]"><i class="fa fa-eye"></i> Subfields</a></li> >+ <li><a href="[% loo.edit | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a href="[% loo.delete | uri %]"><i class="fa fa-trash"></i> Delete</a></li> > </ul> > </div> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >index 3ae74d28e3..488d2e9e01 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -91,7 +91,7 @@ > <ul> > <li><a href="#none">None</a></li> > [% FOREACH imageset IN imagesets %] >- [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#[% imageset.imagesetname | html %]">[% imageset.imagesetname | html %]</a></li> >+ [% IF ( imageset.imagesetactive ) %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#[% imageset.imagesetname | uri %]">[% imageset.imagesetname | html %]</a></li> > [% END %] > </ul> > <div id="none"><ul> >@@ -258,7 +258,7 @@ > No limitation > [% END %] > </td> >- <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&id=[% loo.id | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <td class="actions"><a href="/cgi-bin/koha/admin/authorised_values.pl?op=add_form&id=[% loo.id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> > <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/admin/authorised_values.pl?op=delete&searchfield=[% searchfield | url %]&id=[% loo.id | html %]"><i class="fa fa-trash"></i> Delete</a></td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >index ca72766779..27bb4364e4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -155,9 +155,9 @@ > <a class="btn btn-default btn-xs dropdown-toggle" id="authtypeactions[% authority_type.authtypecode | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtypeactions[% authority_type.authtypecode | html %]"> >- <li><a href="auth_tag_structure.pl?authtypecode=[% authority_type.authtypecode | html %]" class="button parameters"><i class="fa fa-eye"></i> MARC structure</a></li> >- <li><a href="/cgi-bin/koha/admin/authtypes.pl?op=add_form&authtypecode=[% authority_type.authtypecode | html %]"><i class="fa fa-pencil"></i> Edit</a></li> >- [% IF authority_type.authtypecode %]<li><a href="/cgi-bin/koha/admin/authtypes.pl?op=delete_confirm&authtypecode=[% authority_type.authtypecode | html %]"><i class="fa fa-trash"></i> Delete</a></li>[% END %] >+ <li><a href="auth_tag_structure.pl?authtypecode=[% authority_type.authtypecode | uri %]" class="button parameters"><i class="fa fa-eye"></i> MARC structure</a></li> >+ <li><a href="/cgi-bin/koha/admin/authtypes.pl?op=add_form&authtypecode=[% authority_type.authtypecode | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ [% IF authority_type.authtypecode %]<li><a href="/cgi-bin/koha/admin/authtypes.pl?op=delete_confirm&authtypecode=[% authority_type.authtypecode | uri %]"><i class="fa fa-trash"></i> Delete</a></li>[% END %] > </ul> > </div> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >index c2ae0e367a..e565d675b5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -209,9 +209,9 @@ > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="frameworkactions[% loo.frameworkcode | html %]"> >- <li><a href="marctagstructure.pl?frameworkcode=[% loo.frameworkcode | html %]"><i class="fa fa-eye"></i> MARC structure</a></li> >- <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form&frameworkcode=[% loo.frameworkcode | html %]"><i class="fa fa-pencil"></i> Edit</a></li> >- <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=delete_confirm&frameworkcode=[% loo.frameworkcode | html %]"><i class="fa fa-trash"></i> Delete</a></li> >+ <li><a href="marctagstructure.pl?frameworkcode=[% loo.frameworkcode | uri %]"><i class="fa fa-eye"></i> MARC structure</a></li> >+ <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=add_form&frameworkcode=[% loo.frameworkcode | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a href="/cgi-bin/koha/admin/biblio_framework.pl?op=delete_confirm&frameworkcode=[% loo.frameworkcode | uri %]"><i class="fa fa-trash"></i> Delete</a></li> > <!-- Trigger modal --> > <li><a href="#" data-toggle="modal" data-target="#exportModal_[% loo.frameworkcode | html %][% loop.count | html %]" title="Export framework structure (fields, subfields) to a spreadsheet file (.csv, .xml, .ods)"><i class="fa fa-upload"></i> Export</a></li> > <!-- Trigger modal --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >index 23999bc3b2..82d1ab8da6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >@@ -34,7 +34,7 @@ > > <div id="transferlimit_tabs" class="toptabs"> > <ul class="ui-tabs-nav"> >- [% FOREACH codes_loo IN codes_loop %]<li><a href="#[% codes_loo.code | html %]set">[% codes_loo.code | html %]</a></li>[% END %] >+ [% FOREACH codes_loo IN codes_loop %]<li><a href="#[% codes_loo.code | uri %]set">[% codes_loo.code | html %]</a></li>[% END %] > </ul> > > <form method="post" action="branch_transfer_limits.pl"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >index 36228b66df..f0219ef11f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -220,9 +220,9 @@ > [% IF library.branchfax %] > <br />Fax: [% library.branchfax | html %][% END %] > [% IF library.branchemail %] >- <br /><a href="mailto:[% library.branchemail | html %]">[% library.branchemail | html %]</a>[% END %] >+ <br /><a href="mailto:[% library.branchemail | uri %]">[% library.branchemail | html %]</a>[% END %] > [% IF library.branchurl %] >- <br /><a href="[% library.branchurl | html %]">[% library.branchurl | html %]</a>[% END %] >+ <br /><a href="[% library.branchurl | uri %]">[% library.branchurl | html %]</a>[% END %] > [% IF library.opac_info %] > <br />OPAC Info: <div>[% library.opac_info | $raw %]</div>[% END %] > [% IF library.branchnotes %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >index 5a2f5f898d..8956bb15c2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt >@@ -264,7 +264,7 @@ > [% FOREACH account IN ediaccounts %] > <tr> > <td>[% account.id | html %]</td> >- <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% account.vendor_id | html %]">[% account.vendor.name | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% account.vendor_id | uri %]">[% account.vendor.name | html %]</a></td> > <td>[% account.description | html %]</td> > <td>[% account.transport | html %]</td> > <td>[% account.host | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >index dbf11d319d..84180cbf5e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -119,7 +119,7 @@ Item types administration > <label for="description" class="required">Description: </label> > <input type="text" id="description" name="description" size="48" value="[% itemtype.description | html %]" required="required" /> <span class="required">Required</span> > [% IF can_be_translated %] >- <a href="/cgi-bin/koha/admin/localization.pl?entity=itemtypes&code=[% itemtype.itemtype | html %]" title="Translate item type [% itemtype.itemtype | html %]" rel="gb_page_center[600,500]"><i class="fa fa-pencil"></i> Translate into other languages</a> >+ <a href="/cgi-bin/koha/admin/localization.pl?entity=itemtypes&code=[% itemtype.itemtype | uri %]" title="Translate item type [% itemtype.itemtype | html %]" rel="gb_page_center[600,500]"><i class="fa fa-pencil"></i> Translate into other languages</a> > [% END %] > </li> > <li> >@@ -157,7 +157,7 @@ Item types administration > [% ELSE %] > <li> > [% END %] >- <a href="#[% imageset.imagesetname | html %]">[% imageset.imagesetname | html %]</a> >+ <a href="#[% imageset.imagesetname | uri %]">[% imageset.imagesetname | html %]</a> > </li> > [% END %] > [% IF itemtype.image_location('intranet').match('^http') %]<li class="ui-tabs-active">[% ELSE %]<li>[% END %]<a href="#remote">Remote image</a></li> >@@ -345,7 +345,7 @@ Item types administration > </td> > [% END %] > <td> >- <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype | html %]"> >+ <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype | uri %]"> > [% itemtype.itemtype | html %] > </a> > </td> >@@ -376,8 +376,8 @@ Item types administration > <td>[% itemtype.processfee | $Price %]</td> > <td>[% itemtype.checkinmsg | html_line_break | $raw %]</td> > <td class="actions"> >- <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/admin/itemtypes.pl?op=delete_confirm&itemtype=[% itemtype.itemtype | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >index 9a0c38896c..4192ace0e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >@@ -15,14 +15,14 @@ > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a> › <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode | html %]&searchfield=[% tagfield | uri %]">[% IF ( frameworkcode ) %][% frameworkcode | html %][% ELSE %]Default[% END %] framework structure</a> › > [% IF ( add_form ) %] > [% IF ( use_heading_flags_p ) %] >- [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | html %]">Tag [% tagfield | html %] subfield structure</a> › Edit subfields constraints >+ [% IF ( heading_edit_subfields_p ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]">Tag [% tagfield | html %] subfield structure</a> › Edit subfields constraints > [% END %] >- [% ELSE %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | html %]">Tag [% tagfield | html %] Subfield structure</a> › [% action | html %] >+ [% ELSE %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]">Tag [% tagfield | html %] Subfield structure</a> › [% action | html %] > [% END %] > [% END %] >-[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | html %]">Tag [% tagfield | html %] Subfield structure</a> › Confirm deletion of subfield [% tagsubfield | html %] >+[% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]">Tag [% tagfield | html %] Subfield structure</a> › Confirm deletion of subfield [% tagsubfield | html %] > [% END %] >-[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | html %]">Tag [% tagfield | html %] subfield structure</a> › Subfield deleted >+[% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]">Tag [% tagfield | html %] subfield structure</a> › Subfield deleted > [% END %] > [% IF ( else ) %]Tag [% tagfield | html %] Subfield structure[% END %] > </div> >@@ -48,9 +48,9 @@ > <ul> > [% FOREACH loo IN loop %] > [% IF ( loo.new_subfield ) %] >- <li><a href="#sub[% loo.urisubfieldcode | html %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li> >+ <li><a href="#sub[% loo.urisubfieldcode | uri %]field" title="[% loo.liblibrarian | html_entity %]">New</a></li> > [% ELSE %] >- <li><a href="#sub[% loo.urisubfieldcode | html %]field" title="[% loo.liblibrarian | html_entity %]"> >+ <li><a href="#sub[% loo.urisubfieldcode | uri %]field" title="[% loo.liblibrarian | html_entity %]"> > [% loo.subfieldcode | html %] > </a></li> > [% END %] >@@ -60,7 +60,7 @@ > [% FOREACH loo IN loop %] > <div class="constraints" id="sub[% loo.urisubfieldcode | html %]field"> > >- <h3><a href="#basic[% loo.urisubfieldcode | html %]">Basic constraints</a></h3> >+ <h3><a href="#basic[% loo.urisubfieldcode | uri %]">Basic constraints</a></h3> > <div id="basic[% loo.urisubfieldcode | html %]"> > <fieldset class="rows"> > <ol> >@@ -114,7 +114,7 @@ > </div> > > >- <h3><a href="#advanced[% loo.urisubfieldcode | html %]">Advanced constraints</a></h3> >+ <h3><a href="#advanced[% loo.urisubfieldcode | uri %]">Advanced constraints</a></h3> > <div id="advanced[% loo.urisubfieldcode | html %]"> > <fieldset class="rows"> > <ol><li><label for="defaultvalue[% loo.row | html %]">Default value:</label> >@@ -161,7 +161,7 @@ > </ol> > </fieldset> > </div> >- <h3><a href="#oth[% loo.urisubfieldcode | html %]">Other options (choose one)</a></h3> >+ <h3><a href="#oth[% loo.urisubfieldcode | uri %]">Other options (choose one)</a></h3> > <div id="oth[% loo.urisubfieldcode | html %]"> > <fieldset class="rows"> > <ol> >@@ -209,7 +209,7 @@ > [% END %] > </div><!-- /content --> > <fieldset class="action"> >- <input type="submit" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | html %]" class="cancel">Cancel</a> >+ <input type="submit" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]" class="cancel">Cancel</a> > </fieldset> > </form> > [% END %] >@@ -265,7 +265,7 @@ > </tr> > [% FOREACH loo IN loop %] > <tr> >- <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=[% loo.tagfield | html %]&frameworkcode=[% frameworkcode | html %]#sub[% loo.tagsubfield | html %]field">[% loo.tagsubfield | html %]</a></td> >+ <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=[% loo.tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]#sub[% loo.tagsubfield | uri %]field">[% loo.tagsubfield | html %]</a></td> > <td> > [% IF ( loo.subfield_ignored ) %] > <i>[% loo.liblibrarian | html_entity %]</i> >@@ -291,8 +291,8 @@ > [% END %] > </td> > <td class="actions"> >- <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=[% loo.tagfield | html %]&frameworkcode=[% frameworkcode | html %]#sub[% loo.tagsubfield | html %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=delete_confirm&tagfield=[% loo.tagfield | html %]&tagsubfield=[% loo.tagsubfield | html %]&frameworkcode=[% frameworkcode | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=[% loo.tagfield | uri %]&frameworkcode=[% frameworkcode | uri %]#sub[% loo.tagsubfield | uri %]field" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=delete_confirm&tagfield=[% loo.tagfield | uri %]&tagsubfield=[% loo.tagsubfield | uri %]&frameworkcode=[% frameworkcode | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >index 960971784a..121480806e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -21,15 +21,15 @@ > › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> > › <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a> > [% IF ( add_form ) %] >-› <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | html %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END%]</a> >+› <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END%]</a> > › [% action | html %] [% searchfield | html %] > [% ELSIF ( else ) %] >-› <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | html %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a> >+› <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a> > [% ELSIF ( delete_confirm ) %] >-› <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | html %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a> >+› <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a> > › Confirm deletion of tag '[% searchfield | html %]' > [% ELSIF ( delete_confirmed ) %] >-› <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | html %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a> >+› <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% IF framework %][% framework.frameworktext | html %] ([% framework.frameworkcode | html %])[% ELSE %]Default MARC framework[% END %]</a> > › Data deleted > [% END %] > </div> >@@ -207,9 +207,9 @@ > <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]"> >- <li><a href="[% loo.subfield_link | html %]"><i class="fa fa-eye"></i> Subfields</a></li> >- <li><a href="[% loo.edit | html %]"><i class="fa fa-pencil"></i> Edit</a></li> >- <li><a href="[% loo.delete | html %]"><i class="fa fa-trash"></i> Delete</a></li> >+ <li><a href="[% loo.subfield_link | uri %]"><i class="fa fa-eye"></i> Subfields</a></li> >+ <li><a href="[% loo.edit | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a href="[% loo.delete | uri %]"><i class="fa fa-trash"></i> Delete</a></li> > </ul> > </div> > </td> >@@ -230,9 +230,9 @@ > <a class="btn btn-default btn-xs dropdown-toggle" id="marctagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="marctagactions[% loo.tagfield | html %]"> >- <li><a href="[% loo.subfield_link | html %]"><i class="fa fa-eye"></i> Subfields</a></li> >- <li><a href="[% loo.edit | html %]"><i class="fa fa-pencil"></i> Edit</a></li> >- <li><a href="[% loo.delete | html %]"><i class="fa fa-trash"></i> Delete</a></li> >+ <li><a href="[% loo.subfield_link | uri %]"><i class="fa fa-eye"></i> Subfields</a></li> >+ <li><a href="[% loo.edit | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a href="[% loo.delete | uri %]"><i class="fa fa-trash"></i> Delete</a></li> > </ul> > </div> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >index 75c43566a5..353e426dcd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >@@ -92,9 +92,9 @@ > <a class="btn btn-default btn-xs dropdown-toggle" id="oaisetsactions[% set.id | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="oaisetsactions[% set.id | html %]"> >- <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id | html %]"><i class="fa fa-fw fa-pencil"></i> Edit</a></li> >+ <li><a href="/cgi-bin/koha/admin/oai_sets.pl?op=mod&id=[% set.id | uri %]"><i class="fa fa-fw fa-pencil"></i> Edit</a></li> > <li><a class="delete_oai_set" href="/cgi-bin/koha/admin/oai_sets.pl?op=del&id=[% set.id | html %]"><i class="fa fa-fw fa-trash"></i> Delete</a></li> >- <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id | html %]"><i class="fa fa-fw fa-info"></i> Define mappings</a></li> >+ <li><a href="/cgi-bin/koha/admin/oai_set_mappings.pl?id=[% set.id | uri %]"><i class="fa fa-fw fa-info"></i> Define mappings</a></li> > </ul> > </div> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >index d1c7dd78f5..21da724654 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -255,7 +255,7 @@ > <tbody>[% FOREACH loo IN loop %] > <tr> > >- <td><strong><a href="[% loo.edit | html %]">[% loo.variable | html %]</a></strong></td><td> [% loo.explanation | html %]</td> >+ <td><strong><a href="[% loo.edit | uri %]">[% loo.variable | html %]</a></strong></td><td> [% loo.explanation | html %]</td> > [% IF ( loo.oneline ) %] > <td class="single-line"> > [% ELSE %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >index 39c89c8361..749f720007 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt >@@ -206,7 +206,7 @@ > <label for="MyPublicLink">See your public page: </label> > [% IF Koha.Preference('UsageStatsPublicID') %] > [% SET my_url = 'https://hea.koha-community.org/libraries/' _ Koha.Preference('UsageStatsPublicID') %] >- <a href="[% my_url | html %]">[% my_url | html %]</a> >+ <a href="[% my_url | uri %]">[% my_url | html %]</a> > [% ELSE %] > You do not have anything public yet. > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >index feb8e656c5..c027fbd19b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -167,7 +167,7 @@ > <tbody> > [% FOREACH loo IN loop %] > <tr> >- <td><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&id=[% loo.id | html %]">[% loo.servername | html %]</a></td><td>[% loo.host | html %]:[% loo.port | html %]</td><td>[% loo.db | html %]</td><td>[% loo.userid | html %]</td><td>[% IF loo.password %]########[% END %]</td><td>[% IF ( loo.checked ) %]Yes[% ELSE %]No[% END %]</td><td>[% loo.rank | html %]</td> >+ <td><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&id=[% loo.id | uri %]">[% loo.servername | html %]</a></td><td>[% loo.host | html %]:[% loo.port | html %]</td><td>[% loo.db | html %]</td><td>[% loo.userid | html %]</td><td>[% IF loo.password %]########[% END %]</td><td>[% IF ( loo.checked ) %]Yes[% ELSE %]No[% END %]</td><td>[% loo.rank | html %]</td> > <td>[% loo.syntax | html %]</td><td>[% loo.encoding | html %]</td><td>[% loo.timeout | html %]</td> > <td>[% IF ( loo.recordtype == 'biblio' ) %] > <span>Bibliographic</span> >@@ -181,9 +181,9 @@ > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]"> >- <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&id=[% loo.id | html %]"><i class="fa fa-pencil"></i> Edit</a></li> >- <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=add&id=[% loo.id | html %]"><i class="fa fa-copy"></i> Copy</a></li> >- <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=delete_confirmed&id=[% loo.id | html %]" class="delete" data-servername="[% loo.servername | html %]"><i class="fa fa-trash"></i> Delete</a></li> >+ <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=edit&id=[% loo.id | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=add&id=[% loo.id | uri %]"><i class="fa fa-copy"></i> Copy</a></li> >+ <li><a href="/cgi-bin/koha/admin/z3950servers.pl?op=delete_confirmed&id=[% loo.id | uri %]" class="delete" data-servername="[% loo.servername | html %]"><i class="fa fa-trash"></i> Delete</a></li> > </ul> > </div> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >index d1e0b82355..1b85d54b71 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt >@@ -43,7 +43,7 @@ > [% IF too_many_login_attempts %] > <div id="login_error"><strong>Error: </strong>This account has been locked!</div> > [% IF Koha.Preference('OpacResetPassword') && Koha.Preference('OpacBaseURL') %] >- <a href="[% Koha.Preference('OpacBaseURL') | html %]/cgi-bin/koha/opac-password-recovery.pl">You must reset your password</a>. >+ <a href="[% Koha.Preference('OpacBaseURL') | uri %]/cgi-bin/koha/opac-password-recovery.pl">You must reset your password</a>. > [% END %] > [% ELSIF invalid_username_or_password %] > <div id="login_error"><strong>Error: </strong>Invalid username or password</div> >@@ -95,14 +95,14 @@ > [% END %] > > [% IF ( casServerUrl ) %] >- <p><a href="[% casServerUrl | html %]">If you have a CAS account, please click here to login</a>.<p> >+ <p><a href="[% casServerUrl | uri %]">If you have a CAS account, please click here to login</a>.<p> > [% END %] > > [% IF ( casServersLoop ) %] > <p>If you have a CAS account, please choose against which one you would like to authenticate:</p> > <ul> > [% FOREACH casServer IN casServersLoop %] >- <li><a href="[% casServer.value | html %]">[% casServer.name | html %]</a></li> >+ <li><a href="[% casServer.value | uri %]">[% casServer.name | html %]</a></li> > [% END %] > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >index fd6119641f..033c9c909f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt >@@ -190,7 +190,7 @@ function confirmnotdup(redirect){ > [% IF ( duplicateauthid ) %] > <div class="dialog alert"> > <h3>Duplicate record suspected</h3> >- <p>Is this a duplicate of <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | html %]" class="popup" onclick="openWindow('/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | html %]&popup=1', 'DuplicateAuthority','800','600'); return false;" class="button">[% duplicateauthvalue | html %]</a> ?</p> >+ <p>Is this a duplicate of <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | uri %]" class="popup" onclick="openWindow('/cgi-bin/koha/authorities/detail.pl?authid=[% duplicateauthid | html %]&popup=1', 'DuplicateAuthority','800','600'); return false;" class="button">[% duplicateauthvalue | html %]</a> ?</p> > > <form action="authorities.pl" method="get"> > <input type="hidden" name="authid" value="[% duplicateauthid | html %]" /> >@@ -228,7 +228,7 @@ function confirmnotdup(redirect){ > <div id="authoritytabs" class="toptabs numbered"> > <ul> > [% FOREACH BIG_LOO IN BIG_LOOP %] >- <li><a href="#tab[% BIG_LOO.number | html %]XX">[% BIG_LOO.number | html %]</a></li> >+ <li><a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a></li> > [% END %] > </ul> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >index ac2b684c2e..0739df4e5f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt >@@ -44,7 +44,7 @@ > > <div id="action"> > [% IF count %] >- Used in <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&op=do_search&q=an=[% authid | html %]">[% count | html %] record(s)</a> >+ Used in <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&op=do_search&q=an=[% authid | uri %]">[% count | html %] record(s)</a> > [% ELSE %] > This authority is not used in any records. > [% END %] >@@ -54,7 +54,7 @@ > <ul> > [% FOREACH BIG_LOO IN BIG_LOOP %] > <li> >- <a href="#tab[% BIG_LOO.number | html %]XX">[% BIG_LOO.number | html %]</a> >+ <a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a> > </li> > [% END %] > </ul> >@@ -81,12 +81,12 @@ > <span title="[% subfiel.long_desc | html %]" class="desc">[% subfiel.short_desc | html %]</span></label> > [% subfiel.marc_value | html %] > [% IF ( subfiel.link ) %] >- <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&marclist=[% subfiel.link | html %]&operator==&type=intranet&value=[% subfiel.marc_value |url %]"> >+ <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&marclist=[% subfiel.link | uri %]&operator==&type=intranet&value=[% subfiel.marc_value |url %]"> > <img src="[% interface | html %]/[% theme | html %]/images/filefind.png" height="15" title="Search on [% subfiel.marc_value | html %]"> > </a> > [% END %] > [% IF ( subfiel.authority ) %] >- <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% subfiel.authority | html %]" class="button">Auth</a> >+ <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% subfiel.authority | uri %]" class="button">Auth</a> > [% END %] > </p> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >index 73816de5d9..550fabfb25 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt >@@ -46,7 +46,7 @@ div#result { margin-top: 1em; } > [% ELSIF ( result ) %] > > <script type="text/javascript">window.location.href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | html %]"</script> >- <p>The merging was successful. <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | html %]">Click here to see the merged record.</a></p> >+ <p>The merging was successful. <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | uri %]">Click here to see the merged record.</a></p> > > [% ELSIF ( choosereference ) %] > >@@ -55,8 +55,8 @@ div#result { margin-top: 1em; } > <fieldset class="rows"> > <legend>Merge reference</legend> > <ol> >- <li class="radio"><input type="radio" value="[% recordid1 | html %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 | html %]')" /><label for="mergereference1">[% title1 | html %] [% FOREACH subtitl1 IN subtitle1 %] [% subtitl1.subfield | html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | html %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid1 | html %][% IF frameworklabel1 %] — [% frameworklabel1 | html %][% END %]</a>)</label></li> >- <li class="radio"><input type="radio" value="[% recordid2 | html %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 | html %]')" /><label for="mergereference2">[% title2 | html %] [% FOREACH subtitl2 IN subtitle2 %] [% subtitl2.subfield | html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid2 | html %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid2 | html %][% IF frameworklabel2 %] — [% frameworklabel2 | html %][% END %]</a>)</label></li> >+ <li class="radio"><input type="radio" value="[% recordid1 | uri %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 | html %]')" /><label for="mergereference1">[% title1 | html %] [% FOREACH subtitl1 IN subtitle1 %] [% subtitl1.subfield | html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 | uri %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid1 | html %][% IF frameworklabel1 %] — [% frameworklabel1 | html %][% END %]</a>)</label></li> >+ <li class="radio"><input type="radio" value="[% recordid2 | uri %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 | html %]')" /><label for="mergereference2">[% title2 | html %] [% FOREACH subtitl2 IN subtitle2 %] [% subtitl2.subfield | html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid2 | uri %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid2 | html %][% IF frameworklabel2 %] — [% frameworklabel2 | html %][% END %]</a>)</label></li> > > [% IF frameworkselect %] > <li><label for="frameworkcode">Using framework:</label> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >index 0ba25accff..2549c595d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt >@@ -14,7 +14,7 @@ > [% INCLUDE 'auth-finder-search.inc' %] > [% IF ( total ) %]<div class="resultnumber"> > [% IF ( displayprev ) %] >- <a href="auth_finder.pl?startfrom=[% startfromprev | html %]&authtypecode=[% authtypecode | html %][% FOREACH searchdat IN searchdata %]&[% searchdat.term | html %]=[% searchdat.val | html %][% END %]&op=do_search&type=intranet&index=[% index | html %]&tagid=[% tagid | html %]&orderby=[% orderby | html %]"> >+ <a href="auth_finder.pl?startfrom=[% startfromprev | uri %]&authtypecode=[% authtypecode | uri %][% FOREACH searchdat IN searchdata %]&[% searchdat.term | uri %]=[% searchdat.val | uri %][% END %]&op=do_search&type=intranet&index=[% index | uri %]&tagid=[% tagid | uri %]&orderby=[% orderby | uri %]"> > << > </a> > [% END %] >@@ -22,12 +22,12 @@ > [% IF ( number.highlight ) %] > [% number.number | html %] > [% ELSE %] >- <a href="auth_finder.pl?startfrom=[% number.startfrom | html %]&authtypecode=[% authtypecode | html %][% FOREACH searchdat IN number.searchdata %]&[% searchdat.term | html %]=[% searchdat.val | html %][% END %]&op=do_search&type=intranet&index=[% index | html %]&tagid=[% tagid | html %]&orderby=[% orderby | html %]"> >+ <a href="auth_finder.pl?startfrom=[% number.startfrom | uri %]&authtypecode=[% authtypecode | uri %][% FOREACH searchdat IN number.searchdata %]&[% searchdat.term | uri %]=[% searchdat.val | uri %][% END %]&op=do_search&type=intranet&index=[% index | uri %]&tagid=[% tagid | uri %]&orderby=[% orderby | uri %]"> > [% number.number | html %]</a> > [% END %] > [% END %] > [% IF ( displaynext ) %] >- <a href="auth_finder.pl?startfrom=[% startfromnext | html %]&authtypecode=[% authtypecode | html %][% FOREACH searchdat IN searchdata %]&[% searchdat.term | html %]=[% searchdat.val | html %][% END %]&op=do_search&type=intranet&index=[% index | html %]&tagid=[% tagid | html %]&orderby=[% orderby | html %]"> >+ <a href="auth_finder.pl?startfrom=[% startfromnext | uri %]&authtypecode=[% authtypecode | uri %][% FOREACH searchdat IN searchdata %]&[% searchdat.term | uri %]=[% searchdat.val | uri %][% END %]&op=do_search&type=intranet&index=[% index | uri %]&tagid=[% tagid | uri %]&orderby=[% orderby | uri %]"> > >></a> > [% END %] > <div> >@@ -53,7 +53,7 @@ > <td> > [% IF resul.summary && resul.summary.authorized && resul.summary.authorized.size > 1 %] > [% FOREACH authorized IN resul.summary.authorized %] >- <a href="javascript:doauth('[% resul.authid | html %]', '[% index | html %]', '[% loop.count | html %]')" title="[% authorized.heading | html %]">[% loop.count | html %]</a> >+ <a href="javascript:doauth('[% resul.authid | uri %]', '[% index | uri %]', '[% loop.count | uri %]')" title="[% authorized.heading | html %]">[% loop.count | html %]</a> > [% END %] > [% ELSE %] > <a class="btn btn-xs btn-default" href="javascript:doauth('[% resul.authid | html %]', '[% index | html %]', '')"><i class="fa fa-plus"></i> Choose</a> >@@ -67,7 +67,7 @@ > </div> > <div class="resultnumber"> > [% IF ( displayprev ) %] >- <a href="auth_finder.pl?startfrom=[% startfromprev | html %]&authtypecode=[% authtypecode | html %][% FOREACH searchdat IN searchdata %]&[% searchdat.term | html %]=[% searchdat.val | html %][% END %]&op=do_search&type=intranetamp;&index=[% index | html %]&tagid=[% tagid | html %]&orderby=[% orderby | html %]"> >+ <a href="auth_finder.pl?startfrom=[% startfromprev | uri %]&authtypecode=[% authtypecode | uri %][% FOREACH searchdat IN searchdata %]&[% searchdat.term | uri %]=[% searchdat.val | uri %][% END %]&op=do_search&type=intranetamp;&index=[% index | uri %]&tagid=[% tagid | uri %]&orderby=[% orderby | uri %]"> > << > </a> > [% END %] >@@ -75,12 +75,12 @@ > [% IF ( number.highlight ) %] > [% number.number | html %] > [% ELSE %] >- <a href="auth_finder.pl?startfrom=[% number.startfrom | html %]&authtypecode=[% authtypecode | html %][% FOREACH searchdat IN number.searchdata %]&[% searchdat.term | html %]=[% searchdat.val | html %][% END %]&op=do_search&type=intranet&index=[% index | html %]&tagid=[% tagid | html %]&orderby=[% orderby | html %]"> >+ <a href="auth_finder.pl?startfrom=[% number.startfrom | uri %]&authtypecode=[% authtypecode | uri %][% FOREACH searchdat IN number.searchdata %]&[% searchdat.term | uri %]=[% searchdat.val | uri %][% END %]&op=do_search&type=intranet&index=[% index | uri %]&tagid=[% tagid | uri %]&orderby=[% orderby | uri %]"> > [% number.number | html %]</a> > [% END %] > [% END %] > [% IF ( displaynext ) %] >- <a href="auth_finder.pl?startfrom=[% startfromnext | html %]&authtypecode=[% authtypecode | html %][% FOREACH searchdat IN searchdata %]&[% searchdat.term | html %]=[% searchdat.val | html %][% END %]&op=do_search&type=intranet&index=[% index | html %]&tagid=[% tagid | html %]&orderby=[% orderby | html %]"> >+ <a href="auth_finder.pl?startfrom=[% startfromnext | uri %]&authtypecode=[% authtypecode | uri %][% FOREACH searchdat IN searchdata %]&[% searchdat.term | uri %]=[% searchdat.val | uri %][% END %]&op=do_search&type=intranet&index=[% index | uri %]&tagid=[% tagid | uri %]&orderby=[% orderby | uri %]"> > >></a> > [% END %] > </div>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >index fd36faf78f..9da4f2780e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt >@@ -41,11 +41,11 @@ > [% FOREACH resul IN result %] > <tr data-authid="[% resul.authid | html %]"> > <td>[% PROCESS authresult summary=resul.summary %]</td> >- <td><a href="detail.pl?authid=[% resul.authid | html %]">Details</a></td> >+ <td><a href="detail.pl?authid=[% resul.authid | uri %]">Details</a></td> > [% UNLESS ( resul.isEDITORS ) %] > <td> > [% IF resul.used > 0 %] >- <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&op=do_search&idx=an,phr&q=[% resul.authid | html %]" class="button">[% resul.used | html %] record(s)</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&op=do_search&idx=an,phr&q=[% resul.authid | uri %]" class="button">[% resul.used | html %] record(s)</a> > [% ELSE %] > 0 records > [% END %] >@@ -57,7 +57,7 @@ > <a class="btn btn-default btn-xs dropdown-toggle" id="authactions[% resul.authid | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authactions[% resul.authid | html %]"> >- <li><a href="/cgi-bin/koha/authorities/authorities.pl?authid=[% resul.authid | html %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a href="/cgi-bin/koha/authorities/authorities.pl?authid=[% resul.authid | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> > <li><a class="merge_auth" href="#merge"><i class="fa fa-compress"></i> Merge</a></li> > [% UNLESS ( resul.used ) %] > <li><a onclick='return confirm_deletion("[% resul.authid | html %]")'><i class="fa fa-trash"></i> Delete</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >index 52dcec3e58..57b8256604 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt >@@ -50,11 +50,11 @@ > <div class="btn-group"> > <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" href="#" id="downloadcart"><i class="fa fa-download"></i> Download <span class="caret"></span> </a> > <ul class="dropdown-menu"> >- <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&bib_list=[% bib_list | html %]">MARC</a></li> >- <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=ris&bib_list=[% bib_list | html %]">RIS</a></li> >- <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=bibtex&bib_list=[% bib_list | html %]">BibTex</a></li> >+ <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=iso2709&bib_list=[% bib_list | uri %]">iso2709</a></li> >+ <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=ris&bib_list=[% bib_list | uri %]">RIS</a></li> >+ <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=bibtex&bib_list=[% bib_list | uri %]">BibTex</a></li> > [% FOREACH csv_profile IN csv_profiles %] >- <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=[% csv_profile.export_format_id | html %]&bib_list=[% bib_list | html %]">CSV - [% csv_profile.profile | html %]</a></li> >+ <li><a href="/cgi-bin/koha/basket/downloadcart.pl?format=[% csv_profile.export_format_id | uri %]&bib_list=[% bib_list | uri %]">CSV - [% csv_profile.profile | html %]</a></li> > [% END %] > </ul> > </div> >@@ -156,7 +156,7 @@ > [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %] > <p> > [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] >- - <a href="[% MARCNOTE.marcnote | html %]">[% MARCNOTE.marcnote | html %]</a> >+ - <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a> > [% ELSE %] > - [% MARCNOTE.marcnote | html %] > [% END %] >@@ -207,7 +207,7 @@ > <td> > [% FOREACH MARCurl IN BIBLIO_RESULT.MARCURLS %] > [% IF MARCurl.part %]<p>[% MARCurl.part | html %]</p>[% END %] >- <a href="[% MARCurl.MARCURL | html %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a> >+ <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a> > [% IF MARCurl.notes %] > [% FOREACH note IN MARCurl.notes %] > <p>[% note.note | html %]</p> >@@ -262,7 +262,7 @@ > <input type="checkbox" class="select_record" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]" /> > </td> > <td> >- <a href="[% BIBLIO_RESULT.dest | html %]?biblionumber=[% BIBLIO_RESULT.biblionumber | html %]" class="open_title"> >+ <a href="[% BIBLIO_RESULT.dest | uri %]?biblionumber=[% BIBLIO_RESULT.biblionumber | uri %]" class="open_title"> > [% BIBLIO_RESULT.title |html %] > [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %] > [% subtitl.subfield | html %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >index e91c40b31c..f030e0cfcd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt >@@ -75,14 +75,14 @@ > <span class="subfield-label"> > [% UNLESS ( subfiel.hide_marc ) %]<span class="subfield-code">[% subfiel.marc_subfield | html %]</span>[% END %] > <span class="desc" title="[% subfiel.long_desc | html %]">[% subfiel.short_desc | html %]</span></span> >- [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value | html %]">[% subfiel.marc_value | html %]</a>[% ELSE %][% subfiel.marc_value | html %][% END %] >+ [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value | uri %]">[% subfiel.marc_value | html %]</a>[% ELSE %][% subfiel.marc_value | html %][% END %] > [% IF ( subfiel.link ) %] >- <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=[% subfiel.link | html %],phr&type=intranet&q=[% subfiel.marc_value |url %]"> >+ <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&idx=[% subfiel.link | uri %],phr&type=intranet&q=[% subfiel.marc_value |url %]"> > <img src="[% interface | html %]/[% theme | html %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value | html %]" alt="Search on [% subfiel.marc_value | html %]" /> > </a> > [% END %] > [% IF ( subfiel.authority ) %] >- <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% subfiel.authority | html %]" class="button">Auth</a> >+ <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% subfiel.authority | uri %]" class="button">Auth</a> > [% END %] > </p> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >index 321edb43fe..b8f2a6ba7a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt >@@ -38,7 +38,7 @@ > </div> > [% END %] > <div class="btn-group"> >- <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | html %]" class="btn btn-sm btn-link"><i class="fa fa-trash"></i> Clear fields</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn btn-sm btn-link"><i class="fa fa-trash"></i> Clear fields</a> > </div> > </fieldset> > </div> >@@ -103,7 +103,7 @@ > <ul> > [% FOREACH advsearchloo IN advancedsearchesloop %] > <li id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]"> >- <a href="#advsearch-[% advsearchloo.advanced_search_type | html %]"> >+ <a href="#advsearch-[% advsearchloo.advanced_search_type | uri %]"> > [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type > [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection > [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location >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..2abbe4f118 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -91,7 +91,7 @@ > [% IF shelves.count %] > <span class="results_summary"><span class="label">Lists that include this title: </span> > [% FOREACH s IN shelves %] >- <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% s.shelfnumber | html %]">[% s.shelfname | html %]</a> >+ <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a> > [% IF ( loop.last ) %][% ELSE %]|[% END %] > [% END %] > </span> >@@ -108,14 +108,14 @@ > [% END %] > </span> > [% END %] >- <span id="catalogue_detail_marc_preview" class="results_summary"><span class="label">MARC Preview:</span> <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblionumber | html %]&viewas=html" title="MARC" class="previewMARC">Show</a></span> >+ <span id="catalogue_detail_marc_preview" class="results_summary"><span class="label">MARC Preview:</span> <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblionumber | uri %]&viewas=html" title="MARC" class="previewMARC">Show</a></span> > > [% IF ( holdcount ) %] > <span class="results_summary"> > <span class="label">Holds:</span> > <span class="number_box"> > [% IF CAN_user_reserveforothers_place_holds %] >- <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]">[% holdcount | html %]</a> >+ <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">[% holdcount | html %]</a> > [% ELSE %] > <span>[% holdcount | html %]</span> > [% END %] >@@ -127,7 +127,7 @@ > <span class="results_summary"> > <span class="label">Article requests:</span> > <span class="number_box"> >- <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber | html %]">[% article_requests_count | html %]</a> >+ <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% biblionumber | uri %]">[% article_requests_count | html %]</a> > </span> > </span> > [% END %] >@@ -139,7 +139,7 @@ > [% END %] > [% IF ( AmazonCoverImages ) %] > <div id="amazon-bookcoverimg"> >- <a href="http://www.amazon[% AmazonTld | html %]/gp/reader/[% normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link"> >+ <a href="http://www.amazon[% AmazonTld | uri %]/gp/reader/[% normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link"> > <img src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn | html %].01.MZZZZZZZ.jpg" alt="" /> > </a></div> > [% END %] >@@ -188,7 +188,7 @@ > <li>[% IF ( MARCurl.part ) %][% MARCurl.part | html %] > <br />[% END %] > <!-- here you might do a tmpl_if name="toc" and use greybox or equivalent for table of contents --> >- <a href="[% MARCurl.MARCURL | html %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a> >+ <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a> > [% IF ( MARCurl.notes ) %]<ul>[% FOREACH note IN MARCurl.notes %]<li>[% note.note | html %]</li>[% END %]</ul>[% END %]</li> > [% END %]</ul> > </li> >@@ -196,12 +196,12 @@ > > [% IF ( OPACBaseURL ) %] > <li><strong>OPAC view:</strong> >- <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]" target="_blank">Open in new window</a> >+ <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]" target="_blank">Open in new window</a> > </li> > [% END %] > <li id="catalogue_detail_marc_preview"> > <strong>MARC Preview:</strong> >- <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblionumber | html %]" title="MARC" rel="gb_page_center[600,500]">Show</a> >+ <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblionumber | uri %]" title="MARC" rel="gb_page_center[600,500]">Show</a> > </li> > </ul> > </div> >@@ -213,7 +213,7 @@ > [% END %] > [% IF ( AmazonCoverImages ) %] > <div id="amazon-bookcoverimg"> >- <a href="http://www.amazon[% AmazonTld | html %]/gp/reader/[% normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link"> >+ <a href="http://www.amazon[% AmazonTld | uri %]/gp/reader/[% normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link"> > <img src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn | html %].01.MZZZZZZZ.jpg" alt="" /> > </a> > </div> >@@ -260,7 +260,7 @@ > [% IF ( urlS ) %] > <li><strong>URL:</strong> > [% FOREACH url IN urlS %] >- <a href="[% url.url | html %]">[% url.url | html %]</a> >+ <a href="[% url.url | uri %]">[% url.url | html %]</a> > [% END %] > </li> > [% END %] >@@ -269,7 +269,7 @@ > <li><strong>Lists that include this title: </strong> > <ul> > [% FOREACH s IN shelves %] >- <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% s.shelfnumber | html %]">[% s.shelfname | html %]</a></li> >+ <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a></li> > [% END %] > </ul> > </li> >@@ -288,7 +288,7 @@ > [% END %] > </ul></li> > [% END %] >- [% IF ( holdcount ) %]<li><strong>Holds:</strong> <span class="number_box"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | html %]">[% holdcount | html %]</a></span></li>[% ELSE %][% END %] >+ [% IF ( holdcount ) %]<li><strong>Holds:</strong> <span class="number_box"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber | uri %]">[% holdcount | html %]</a></span></li>[% ELSE %][% END %] > </ul> > [% END %] > >@@ -478,7 +478,7 @@ > </td> > <td class="datelastseen"><span title="[% item.datelastseen | html %]">[% item.datelastseen | $KohaDates %]</span></td> > <td class="dateaccessioned"><span title="[% item.dateaccessioned | html %]">[% item.dateaccessioned | $KohaDates %]</span></td> >- <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=[% item.type | html %]&itemnumber=[% item.itemnumber | html %]&biblionumber=[% item.biblionumber | html %]&bi=[% item.biblioitemnumber | html %]#item[% item.itemnumber | html %]">[% item.barcode | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=[% item.type | uri %]&itemnumber=[% item.itemnumber | uri %]&biblionumber=[% item.biblionumber | uri %]&bi=[% item.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a></td> > [% IF ( volinfo ) %] > <td class="enumchron"> > [% IF ( itemdata_enumchron ) %] >@@ -500,7 +500,7 @@ > </td> > [% END %] > [% IF ( itemdata_uri ) %] >- <td class="uri"><a href="[% item.uri | html %]">[% item.uri | html %]</a></td> >+ <td class="uri"><a href="[% item.uri | uri %]">[% item.uri | html %]</a></td> > [% END %] > [% IF ( itemdata_copynumber ) %] > <td class="copynumber">[% item.copynumber | html %]</td> >@@ -518,20 +518,20 @@ > <td class="nonpublicnote">[% item.itemnotes_nonpublic | html %]</td> > [% END %] > [% IF ( SpineLabelShowPrintOnBibDetails ) %] >- <td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% item.barcode | html %]" >Print label</a></td> >+ <td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% item.barcode | uri %]" >Print label</a></td> > [% END %] > [% IF ( hostrecords ) %] >- <td>[% IF ( item.hostbiblionumber) %]<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.hostbiblionumber | html %]" >[% item.hosttitle | html %]</a>[% END %]</td> >+ <td>[% IF ( item.hostbiblionumber) %]<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.hostbiblionumber | uri %]" >[% item.hosttitle | html %]</a>[% END %]</td> > [% END %] > [% IF ( analyze ) %] > <td> > [% IF ( item.countanalytics ) %] >- <a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&q=[% item.itemnumber | html %]">[% item.countanalytics | html %] analytics</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&q=[% item.itemnumber | uri %]">[% item.countanalytics | html %] analytics</a> > [% END %] > </td> > [% END %] > [% IF ( analyze ) %] >- <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% item.biblionumber | html %]&hostitemnumber=[% item.itemnumber | html %]">Create analytics</a></td> >+ <td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?hostbiblionumber=[% item.biblionumber | uri %]&hostitemnumber=[% item.itemnumber | uri %]">Create analytics</a></td> > [% END %] > > [% IF ShowCourseReserves %] >@@ -540,7 +540,7 @@ > [% FOREACH r IN item.course_reserves %] > [% IF r.course.enabled == 'yes' %] > <p> >- <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% r.course.course_id | html %]"> >+ <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% r.course.course_id | uri %]"> > [% r.course.course_name | html %] > <!--[% IF r.course.course_number %] [% r.course.course_number | html %] [% END %]--> > [% IF r.course.section %] [% r.course.section | html %] [% END %] >@@ -579,7 +579,7 @@ > [% PROCESS items_table tab="holdings" items=itemloop %] > [% END %] > [% IF ( hiddencount ) %] >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]&showallitems=1">Show all items ([% hiddencount | html %] hidden)</a> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&showallitems=1">Show all items ([% hiddencount | html %] hidden)</a> > [% END %] > [% IF ( debug_display ) %] > <br /><br /> >@@ -626,7 +626,7 @@ > [% FOREACH MARCNOTE IN MARCNOTES %] > <p> > [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] >- <a href="[% MARCNOTE.marcnote | html %]">[% MARCNOTE.marcnote | html %]</a> >+ <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a> > [% ELSE %] > [% MARCNOTE.marcnote FILTER html_line_break | html %] > [% END %] >@@ -691,7 +691,7 @@ > [% END %] > </table> > [% END %] >- <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]">Subscription details</a> >+ <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]">Subscription details</a> > [% END %] > </div> > </div> >@@ -787,9 +787,9 @@ > [% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %] > <div id="editions"><h4>Editions</h4> > <table> >-[% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn | html %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %] >+[% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn | html %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %] > [% UNLESS ( item_level_itypes ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description | html %][% ELSE %]<img src="[% XISBN.imageurl | html %]" alt="[% XISBN.description | html %]" title="[% XISBN.description | html %]">[% END %]</td>[% END %] >-<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber | html %]">[% XISBN.title | html %]</a> by [% XISBN.author | html %] ©[% XISBN.copyrightdate | html %] >+<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber | uri %]">[% XISBN.title | html %]</a> by [% XISBN.author | html %] ©[% XISBN.copyrightdate | html %] > [% IF ( XISBN.publishercode ) %] > [% XISBN.publishercode | html %] [% IF ( XISBN.place ) %]([% XISBN.place | html %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear | html %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement | html %][% END %] [% IF ( XISBN.editionresponsibility ) %][% XISBN.editionresponsibility | html %][% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >index 215b40d23c..0b0ce8019a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt >@@ -56,7 +56,7 @@ > [% END %] > <td> > [% IF checkout.item.barcode %] [%# FIXME This test is not mandatory I think %] >- <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout.item.biblionumber | html %]&itemnumber=[% checkout.item.itemnumber | html %]">[% checkout.item.barcode | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout.item.biblionumber | uri %]&itemnumber=[% checkout.item.itemnumber | uri %]">[% checkout.item.barcode | html %]</a> > [% ELSE %] > > [% END %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >index 119bd110e8..4474432d93 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt >@@ -39,19 +39,19 @@ > <li><span class="label">Physical details:</span> [% pages | html %] [% illus | html %] [% size | html %] </li> > [% IF ( bnotes ) %]<li><span class="label">Notes:</span> [% bnotes | html %]</li>[% END %] > <li><span class="label">No. of items:</span> [% count | html %] [% IF ( hiddencount ) %]total ([% showncount | html %] shown / [% hiddencount | html %] hidden) >-<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | html %]&showallitems=1">Show all items</a>[% END %]</li> >+<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&showallitems=1">Show all items</a>[% END %]</li> > </ol> > > <br clear="all" /> > [% IF ( ONLY_ONE ) %] >- <div class="dialog message">You are only viewing one item. <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | html %]&bi=[% biblioitemnumber | html %]#item[% itemnumber | html %]">View All</a></div> >+ <div class="dialog message">You are only viewing one item. <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblionumber | uri %]&bi=[% biblioitemnumber | uri %]#item[% itemnumber | uri %]">View All</a></div> > [% END %] > [% FOREACH ITEM_DAT IN ITEM_DATA %] > <div class="yui-g"> > <h3 id="item[% ITEM_DAT.itemnumber | html %]">Barcode [% ITEM_DAT.barcode | html %] [% IF ( ITEM_DAT.notforloantext ) %][% ITEM_DAT.notforloantext | html %] [% END %]</h3> > <div class="listgroup"><h4>Item information [% IF ( CAN_user_editcatalogue_edit_catalogue ) %][% UNLESS ( ITEM_DAT.nomod ) %] > [% IF ( CAN_user_editcatalogue_edit_items ) %] >- <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% ITEM_DAT.biblionumber | html %]&itemnumber=[% ITEM_DAT.itemnumber | html %]">[Edit Item]</a> >+ <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% ITEM_DAT.biblionumber | uri %]&itemnumber=[% ITEM_DAT.itemnumber | uri %]">[Edit Item]</a> > [% END %] > [% END %][% END %]</h4> > <ol class="bibliodetails"> >@@ -196,7 +196,7 @@ > [% IF ITEM_DAT.basketno %] > <li><span class="label">Order date:</span> > [% IF ( CAN_user_acquisition_order_manage ) %] >- <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ITEM_DAT.basketno | html %]">[% ITEM_DAT.orderdate | $KohaDates %]</a> >+ <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ITEM_DAT.basketno | uri %]">[% ITEM_DAT.orderdate | $KohaDates %]</a> > [% ELSE %] > [% ITEM_DAT.orderdate | $KohaDates %] > [% END %] >@@ -209,7 +209,7 @@ > [% IF ITEM_DAT.dateaccessioned %] > <li><span class="label">Accession date:</span> > [% IF ( CAN_user_acquisition_order_receive && ITEM_DAT.invoiceid ) %] >- <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% ITEM_DAT.invoiceid | html %]">[% ITEM_DAT.dateaccessioned | $KohaDates %]</a> >+ <a href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% ITEM_DAT.invoiceid | uri %]">[% ITEM_DAT.dateaccessioned | $KohaDates %]</a> > [% ELSE %] > [% ITEM_DAT.dateaccessioned | $KohaDates %] > [% END %] >@@ -221,16 +221,16 @@ > </li> > [% END %] > >- <li><span class="label">Total checkouts:</span>[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues | html %][% ELSE %]0[% END %] (<a href="/cgi-bin/koha/circ/bookcount.pl?&biblionumber=[% ITEM_DAT.biblionumber | html %]&itm=[% ITEM_DAT.itemnumber | html %]">View item's checkout history</a>)</li> >+ <li><span class="label">Total checkouts:</span>[% IF ( ITEM_DAT.issues ) %][% ITEM_DAT.issues | html %][% ELSE %]0[% END %] (<a href="/cgi-bin/koha/circ/bookcount.pl?&biblionumber=[% ITEM_DAT.biblionumber | uri %]&itm=[% ITEM_DAT.itemnumber | uri %]">View item's checkout history</a>)</li> > > <li><span class="label">Last seen:</span>[% IF ( ITEM_DAT.datelastseen ) %][% ITEM_DAT.datelastseen | $KohaDates %] [%END %] </li> > <li><span class="label">Last borrowed:</span>[% IF (ITEM_DAT.datelastborrowed ) %][% ITEM_DAT.datelastborrowed | $KohaDates %][% END %] </li> > [% IF Koha.Preference('StoreLastBorrower') && ITEM_DAT.object.last_returned_by %] >- <li><span class="label">Last returned by:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.object.last_returned_by.borrowernumber | html %]">[% ITEM_DAT.object.last_returned_by.cardnumber | html %]</a> </li> >+ <li><span class="label">Last returned by:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.object.last_returned_by.borrowernumber | uri %]">[% ITEM_DAT.object.last_returned_by.cardnumber | html %]</a> </li> > [% END %] >- [% IF ( ITEM_DAT.card0 ) %]<li><span class="label">Last borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower0 | html %]">[% ITEM_DAT.card0 | html %]</a> </li>[% END %] >- [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower1 | html %]">[% ITEM_DAT.card1 | html %]</a> </li>[% END %] >- [% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 | html %]">[% ITEM_DAT.card2 | html %]</a> </li>[% END %] >+ [% IF ( ITEM_DAT.card0 ) %]<li><span class="label">Last borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower0 | uri %]">[% ITEM_DAT.card0 | html %]</a> </li>[% END %] >+ [% IF ( ITEM_DAT.card1 ) %]<li><span class="label">Previous borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower1 | uri %]">[% ITEM_DAT.card1 | html %]</a> </li>[% END %] >+ [% IF ( ITEM_DAT.card2 ) %]<li><span class="label">Previous borrower:</span> <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% ITEM_DAT.borrower2 | uri %]">[% ITEM_DAT.card2 | html %]</a> </li>[% END %] > [% IF ( ITEM_DAT.paidfor ) %]<li><span class="label">Paid for?:</span> [% ITEM_DAT.paidfor | html %] </li>[% END %] > > [% IF ( ITEM_DAT.enumchron ) %]<li><span class="label">Serial enumeration:</span> [% ITEM_DAT.enumchron | html %] </li>[% 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 7024546f9e..7d6468e9b0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -44,7 +44,7 @@ > <ul style="list-style: none;"> > [% FOREACH SPELL_SUGGES IN SPELL_SUGGEST %] > <li> >- <a href="/cgi-bin/koha/catalogue/search.pl?q=[% SPELL_SUGGES.spsuggestion | html %]">[% SPELL_SUGGES.spsuggestion | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?q=[% SPELL_SUGGES.spsuggestion | uri %]">[% SPELL_SUGGES.spsuggestion | html %]</a> > </li> > [% END %] > </ul> >@@ -326,7 +326,7 @@ > [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] > <tr> > <td> >- <a href="/cgi-bin/koha/catalogue/search.pl?idx=[% scan_index_to_use | html %]&q=[% SEARCH_RESULT.scan_use |url %]"[% SEARCH_RESULT.title | html %]"">[% SEARCH_RESULT.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/search.pl?idx=[% scan_index_to_use | uri %]&q=[% SEARCH_RESULT.scan_use |url %]"[% SEARCH_RESULT.title | uri %]"">[% SEARCH_RESULT.title | html %]</a> > </td> > <td> > [% SEARCH_RESULT.author | html %] >@@ -443,7 +443,7 @@ > [% ELSE %] > [% IF CAN_user_reserveforothers_place_holds %] > <a id="reserve_[% SEARCH_RESULT.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %])</a> >- [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]&findborrower=[% holdfor_cardnumber | html %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %] >+ [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]&findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %] > [% ELSE %] > Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) | html %]) > [% END %] >@@ -462,15 +462,15 @@ > [% END %] > > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] >- | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Edit record</a> >+ | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit record</a> > [% END %] > [% IF ( CAN_user_editcatalogue_edit_items ) %] >- | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Edit items</a> >+ | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Edit items</a> > [% END %] > > [% IF ( OPACBaseURL ) %] > <span class="view-in-opac"> >- | <a href="[% Koha.Preference('OPACBaseURL') | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]" target="_blank">OPAC view</a> >+ | <a href="[% Koha.Preference('OPACBaseURL') | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" target="_blank">OPAC view</a> > </span> > [% END %] > >@@ -594,7 +594,7 @@ > [% IF ( outer_sup_results_loo.inner_sup_results_loop ) %] > [% outer_sup_results_loo.servername | html %] > [% FOREACH inner_sup_results_loo IN outer_sup_results_loo.inner_sup_results_loop %] >- <div><a href="/cgi-bin/koha/catalogue/search.pl?[% inner_sup_results_loo.query_cgi | html %][% inner_sup_results_loo.limit_cgi | html %][% inner_sup_results_loo.sort_by | html %][% inner_sup_results_loo.link | html %]">[% inner_sup_results_loo.title | html %]</a></div> >+ <div><a href="/cgi-bin/koha/catalogue/search.pl?[% inner_sup_results_loo.query_cgi | uri %][% inner_sup_results_loo.limit_cgi | uri %][% inner_sup_results_loo.sort_by | uri %][% inner_sup_results_loo.link | uri %]">[% inner_sup_results_loo.title | html %]</a></div> > [% END %] > [% END %] > <!-- </div> --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >index f82f1a3b47..34111a2042 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt >@@ -57,7 +57,7 @@ > <tr> > <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td> > <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td> >- <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td> > <td>[% s.total | html %]</td> > </tr> > [% END %] >@@ -94,7 +94,7 @@ > <tr> > <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td> > <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td> >- <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td> > <td>[% s.total | html %]</td> > </tr> > [% END %] >@@ -137,7 +137,7 @@ > <tr> > <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td> > <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td> >- <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td> >+ <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td> > <td>[% s.total | html %]</td> > </tr> > [% END %] >@@ -174,7 +174,7 @@ > <tr> > <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td> > <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td> >- <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td> >+ <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td> > <td>[% s.total | html %]</td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >index 7eb4402477..bcc51673bb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt >@@ -570,7 +570,7 @@ function Changefwk() { > <div id="addbibliotabs" class="toptabs numbered"> > <ul> > [% FOREACH BIG_LOO IN BIG_LOOP %] >- <li><a href="#tab[% BIG_LOO.number | html %]XX">[% BIG_LOO.number | html %]</a></li> >+ <li><a href="#tab[% BIG_LOO.number | uri %]XX">[% BIG_LOO.number | html %]</a></li> > [% END %] > </ul> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >index ce3bf76f5b..f9f9d00cdd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -27,7 +27,7 @@ > <ul class="dropdown-menu"> > <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=">Default framework</a></li> > [% FOREACH framework IN frameworks %] >- <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=[% framework.frameworkcode | html %]">[% framework.frameworktext | html %]</a></li> >+ <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=[% framework.frameworkcode | uri %]">[% framework.frameworktext | html %]</a></li> > [% END %] > </ul> > </div> >@@ -76,7 +76,7 @@ > <td><input type="checkbox" class="selection" id="bib[% resultsloo.biblionumber | html %]" name="biblionumber" value="[% resultsloo.biblionumber | html %]" /></td> > <td> > <p> >- <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% resultsloo.biblionumber | html %]">[% resultsloo.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% resultsloo.biblionumber | uri %]">[% resultsloo.title | html %]</a> > [% FOREACH subtitl IN resultsloo.subtitle %][% subtitl.subfield | html %][% END %]</p> > [% IF ( resultsloo.summary ) %] > <p>[% resultsloo.summary | html %]</p> >@@ -131,10 +131,10 @@ > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% resultsloo.biblionumber | html %]"> >- <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% resultsloo.biblionumber | html %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li> >- <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% resultsloo.biblionumber | html %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li> >- [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% resultsloo.biblionumber | html %]"><i class="fa fa-pencil"></i> Edit biblio</a></li>[% END %] >- [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% resultsloo.biblionumber | html %]"><i class="fa fa-plus"></i> Add/Edit items</a></li>[% END %] >+ <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% resultsloo.biblionumber | uri %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% resultsloo.biblionumber | uri %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li> >+ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% resultsloo.biblionumber | uri %]"><i class="fa fa-pencil"></i> Edit biblio</a></li>[% END %] >+ [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% resultsloo.biblionumber | uri %]"><i class="fa fa-plus"></i> Add/Edit items</a></li>[% END %] > </ul> > </div> > </td> >@@ -178,10 +178,10 @@ > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reservoirsearchactions[% breeding_loo.id | html %]"> >- <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id | html %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li> >- <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.id | html %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id | uri %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.id | uri %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li> > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] >- <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id | html %]"><i class="fa fa-plus"></i> Add biblio</a></li> >+ <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id | uri %]"><i class="fa fa-plus"></i> Add biblio</a></li> > [% END %] > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >index 8f14152e89..7d88b902d0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt >@@ -36,9 +36,9 @@ $(document).ready(function(){ > var rowid = $(this).parent().attr("id"); > num_rowid = rowid.replace("row",""); > $(".linktools").remove(); >- var edit_link = $('<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&frameworkcode=[% frameworkcode | html %]&biblionumber=[% biblionumber | html %]&itemnumber='+num_rowid+'&searchid=[% searchid | html %]#edititem"></a>'); >+ var edit_link = $('<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&frameworkcode=[% frameworkcode | uri %]&biblionumber=[% biblionumber | uri %]&itemnumber='+num_rowid+'&searchid=[% searchid | uri %]#edititem"></a>'); > $(edit_link).text(_("Edit item")); >- var delete_link = $('<a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&frameworkcode=[% frameworkcode | html %]&biblionumber=[% biblionumber | html %]&itemnumber='+num_rowid+'&searchid=[% searchid | html %]"></a>'); >+ var delete_link = $('<a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&frameworkcode=[% frameworkcode | uri %]&biblionumber=[% biblionumber | uri %]&itemnumber='+num_rowid+'&searchid=[% searchid | uri %]"></a>'); > $(delete_link).text(_("Delete item")); > $(delete_link).on('click', function(e) { > return confirm_deletion(); >@@ -151,8 +151,8 @@ function confirm_deletion() { > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> > › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> >- › Edit <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | html %]">[% title | html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber | html %])</a> >- › <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | html %]">Items</a> >+ › Edit <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber | uri %]">[% title | html %] [% IF ( author ) %] by [% author | html %][% END %] (Record #[% biblionumber | html %])</a> >+ › <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% biblionumber | uri %]">Items</a> > </div> > > <div id="doc3" class="yui-t7"> >@@ -167,7 +167,7 @@ function confirm_deletion() { > [% IF ( book_on_loan ) %]<div class="dialog alert"><strong>Cannot delete</strong>: item is checked out.</div>[% END %] > [% IF ( book_reserved ) %]<div class="dialogalert"><strong>Cannot delete</strong>: item has a waiting hold.</div>[% END %] > [% IF ( not_same_branch ) %]<div class="dialog alert"><strong>Cannot delete</strong>: The items do not belong to your library.</div>[% END %] >-[% IF ( linked_analytics ) %]<div class="dialog alert"><strong>Cannot delete</strong>: item has linked <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]&analyze=1">analytics.</a>.</div>[% END %] >+[% IF ( linked_analytics ) %]<div class="dialog alert"><strong>Cannot delete</strong>: item has linked <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]&analyze=1">analytics.</a>.</div>[% END %] > > <div id="cataloguing_additem_itemlist"> > [% IF ( item_loop ) %] >@@ -213,11 +213,11 @@ function confirm_deletion() { > <ul class="dropdown-menu" role="menu" aria-labelledby="itemactions[% item_loo.itemnumber | html %]"> > > [% IF ( item_loo.hostitemflag ) %] >- <li><a href="additem.pl?op=edititem&biblionumber=[% item_loo.hostbiblionumber | html %]&itemnumber=[% item_loo.itemnumber | html %]#edititem">Edit in host</a> <a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delinkitem&biblionumber=[% biblionumber | html %]&hostitemnumber=[% item_loo.itemnumber | html %]&searchid=[% searchid | html %]">Delink</a></li> >+ <li><a href="additem.pl?op=edititem&biblionumber=[% item_loo.hostbiblionumber | uri %]&itemnumber=[% item_loo.itemnumber | uri %]#edititem">Edit in host</a> <a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delinkitem&biblionumber=[% biblionumber | html %]&hostitemnumber=[% item_loo.itemnumber | html %]&searchid=[% searchid | html %]">Delink</a></li> > [% ELSE %] >- <li><a href="additem.pl?op=edititem&biblionumber=[% biblionumber | html %]&itemnumber=[% item_loo.itemnumber | html %]&searchid=[% searchid | html %]#edititem">Edit</a></li> >- <li><a href="additem.pl?op=dupeitem&biblionumber=[% biblionumber | html %]&itemnumber=[% item_loo.itemnumber | html %]&searchid=[% searchid | html %]#additema">Duplicate</a></li> >- <li class="print_label"><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=add&number_type=itemnumber&number_list=[% item_loo.itemnumber | html %]" target="_blank" >Print Label</a></li> >+ <li><a href="additem.pl?op=edititem&biblionumber=[% biblionumber | uri %]&itemnumber=[% item_loo.itemnumber | uri %]&searchid=[% searchid | uri %]#edititem">Edit</a></li> >+ <li><a href="additem.pl?op=dupeitem&biblionumber=[% biblionumber | uri %]&itemnumber=[% item_loo.itemnumber | uri %]&searchid=[% searchid | uri %]#additema">Duplicate</a></li> >+ <li class="print_label"><a href="/cgi-bin/koha/labels/label-edit-batch.pl?op=add&number_type=itemnumber&number_list=[% item_loo.itemnumber | uri %]" target="_blank" >Print Label</a></li> > [% IF ( item_loo.countanalytics ) %] > <li><a href="/cgi-bin/koha/catalogue/search.pl?idx=hi&q=% item_loo.itemnumber %]">View analytics</a></li> > [% ELSE %] >@@ -362,7 +362,7 @@ function confirm_deletion() { > <input type="hidden" name="field_value" value="[% itemnumber | html %]" /> > <input type="submit" value="Save changes" onclick="return Check(this.form)"> > <input type="button" id="addnewitem" value="Add a new item"> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]">Cancel</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Cancel</a> > [% END %]</fieldset> > > [%# Fields for fast cataloging %] >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 a1f8482fb9..2b1bcede99 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -41,7 +41,7 @@ div#result { margin-top: 1em; } > [% END %] > > [% ELSE %] >- <p>The merge was successful. <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% ref_biblionumber | html %]">Click here to see the merged record.</a></p> >+ <p>The merge was successful. <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% ref_biblionumber | uri %]">Click here to see the merged record.</a></p> > <h3>Report</h3> > <table> > <thead> >@@ -105,7 +105,7 @@ div#result { margin-top: 1em; } > [% FOREACH subtitle IN record.subtitles %] > [% subtitle.subfield | html %] > [% END %] >- ([% record.biblionumber | html %]) <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% record.biblionumber | html %]" class="previewData">View MARC</a> >+ ([% record.biblionumber | uri %]) <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% record.biblionumber | uri %]" class="previewData">View MARC</a> > </label> > </li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt >index 89c5a9ccf5..974bee254d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/cn_browser.tt >@@ -34,7 +34,7 @@ > <tr> > <td style="background:[% cn_loo.background | html %];">[% cn_loo.itemcallnumber | html %]</td> > <td style="background:[% cn_loo.background | html %];"> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cn_loo.biblionumber | html %]"> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cn_loo.biblionumber | uri %]"> > [% cn_loo.title | html %] [% cn_loo.subtitle | html %] [% cn_loo.subtitle2 | html %] > [% IF ( cn_loo.author ) %] > <span>by</span> [% cn_loo.author | html %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt >index e5a7e09ae9..0144cdf615 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt >@@ -22,7 +22,7 @@ > <div id="macles" class="toptabs numbered"> > [% IF ( BIGLOOP ) %]<ul> > [% FOREACH BIGLOO IN BIGLOOP %] >- <li><a href="#tab[% BIGLOO.number | html %]XX">[% BIGLOO.number | html %]</a></li> >+ <li><a href="#tab[% BIGLOO.number | uri %]XX">[% BIGLOO.number | html %]</a></li> > [% END %] > </ul>[% END %] > <!-- RESET PAGINATION --> >@@ -68,7 +68,7 @@ > [% FOREACH List IN BIGLOO.Lists %] > <h3>[% List.lib | html %]</h3> > [% FOREACH liblis IN List.liblist %] >- <a href="#[% liblis.listvalue | html %]" onclick="check_multiple([% liblis.listvalue | html %])"> [% liblis.listlib | html %]</a><br /> >+ <a href="#[% liblis.listvalue | uri %]" onclick="check_multiple([% liblis.listvalue | html %])"> [% liblis.listlib | html %]</a><br /> > [% END %] > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt >index 4b71b80d92..4b7f2788f5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt >@@ -84,9 +84,9 @@ > > <td> > [% IF ( resul.biblionumber ) %] >- <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&index=[% index | html %]&biblionumber=[% resul.biblionumber | html %]&type=intranet&op=fillinput')">Choose</a> >+ <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&index=[% index | uri %]&biblionumber=[% resul.biblionumber | uri %]&type=intranet&op=fillinput')">Choose</a> > [% ELSE %] >- <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&index=[% index | html %]&type=intranet&op=fillinput')">Clear field</a> >+ <a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=marc21_linking_section.pl&index=[% index | uri %]&type=intranet&op=fillinput')">Clear field</a> > [% END %] > </td> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index a72dc19fe3..0251ba4649 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >@@ -94,7 +94,7 @@ > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]"> >- <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | html %]" class="previewMARC"><i class="fa fa-eye"></i> MARC preview</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewMARC"><i class="fa fa-eye"></i> MARC preview</a></li> > <li><a href="#" class="import_record" data-breedingid="[% breeding_loo.breedingid | html %]" data-heading_code="[% breeding_loo.heading_code | html %]" data-authid="[% breeding_loo.authid | html %]"><i class="fa fa-download"></i> Import</a></li> > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >index 4792b1d4d3..3e074c455a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >@@ -137,8 +137,8 @@ > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]"> >- <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | html %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li> >- <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid | html %]" title="Card" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li> > <li><a href="#" class="import_record" data-breedingid="[% breeding_loo.breedingid | html %]" data-biblionumber="[% breeding_loo.biblionumber | html %]" data-frameworkcode="[% frameworkcode | uri %]"><i class="fa fa-download"></i> Import</a></li> > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >index 4401043a5a..5ccfea70f7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >@@ -128,7 +128,7 @@ > <td><input type="checkbox" reqid="[% ar.id | html %]"/></td> > <td class="ar-title"> > <p> >- <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% ar.biblionumber | html %]"> >+ <a href="/cgi-bin/koha/circ/request-article.pl?biblionumber=[% ar.biblionumber | uri %]"> > <strong>[% ar.biblio.title | html %]</strong> > [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %] > </a> >@@ -182,7 +182,7 @@ > <td class="ar-barcode">[% ar.item.barcode | html %]</td> > <td class="ar-patron"> > <p> >- <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | html %]"> >+ <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]"> > [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %]) > </a> > </p> >@@ -236,7 +236,7 @@ > <td><input type="checkbox" reqid="[% ar.id | html %]"/></td> > <td class="ar-title"> > <p> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ar.biblionumber | html %]"> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ar.biblionumber | uri %]"> > <strong>[% ar.biblio.title | html %]</strong> > [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %] > </a> >@@ -290,7 +290,7 @@ > <td class="ar-barcode">[% ar.item.barcode | html %]</td> > <td class="ar-patron"> > <p> >- <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | html %]"> >+ <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% ar.borrower.cardnumber | uri %]"> > [% ar.borrower.surname | html %][% IF ar.borrower.firstname %], [% ar.borrower.firstname | html %][% END %] ([% ar.borrower.cardnumber | html %]) > </a> > </p> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >index 8994f47367..e8490d4a47 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt >@@ -49,10 +49,10 @@ > <br />Barcode : [% overduesloo.barcode | html %] > </td> > <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overduesloo.borrowernumber | html %]">[% overduesloo.borrowersurname | html %], [% overduesloo.borrowerfirstname | html %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overduesloo.borrowernumber | uri %]">[% overduesloo.borrowersurname | html %], [% overduesloo.borrowerfirstname | html %]</a> > <br />[% overduesloo.cardnumber | html %] > <br />[% overduesloo.borrowerphone | html %]<br /> >- [% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail | html %]?subject=Overdue: [% overduesloo.title | html %]"> >+ [% IF ( overduesloo.borroweremail ) %]<a href="mailto:[% overduesloo.borroweremail | uri %]?subject=Overdue: [% overduesloo.title | uri %]"> > [% overduesloo.borroweremail | html %]</a>[% END %] > </td> > <td>[% Branches.GetName( overduesloo.homebranch ) | html %] [% overduesloo.itemcallnumber | html %] >@@ -83,23 +83,23 @@ > </td> > <td> > <p> >- <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% todayoverduesloo.biblionumber | html %]">[% todayoverduesloo.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=[% todayoverduesloo.biblionumber | uri %]">[% todayoverduesloo.title | html %]</a> > (<b>[% todayoverduesloo.description | html %]</b>) > <br />Barcode : [% todayoverduesloo.barcode | html %] > </p> > </td> > <td> >- <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% todayoverduesloo.borrowernumber | html %]">[% todayoverduesloo.borrowersurname | html %] [% todayoverduesloo.borrowerfirstname | html %]</a> >+ <p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% todayoverduesloo.borrowernumber | uri %]">[% todayoverduesloo.borrowersurname | html %] [% todayoverduesloo.borrowerfirstname | html %]</a> > <br />[% todayoverduesloo.cardnumber | html %]<br /> > <br />[% todayoverduesloo.borrowerphone | html %]<br /> >- [% IF ( todayoverduesloo.borroweremail ) %]<a href="mailto:[% todayoverduesloo.borroweremail | html %]?subject=Overdue: [% todayoverduesloo.title | html %]"> >+ [% IF ( todayoverduesloo.borroweremail ) %]<a href="mailto:[% todayoverduesloo.borroweremail | uri %]?subject=Overdue: [% todayoverduesloo.title | uri %]"> > [% todayoverduesloo.borroweremail | html %]</a>[% END %] > </p> > </td> > <td><p>[% Branches.GetName( todayoverduesloo.homebranch ) | html %] [% todayoverduesloo.itemcallnumber | html %]</p> > </td> > <td> >- <a href="branchoverdues.pl?action=remove&borrowernumber=[% todayoverduesloo.borrowernumber | html %]&itemnumber=[% todayoverduesloo.itemnumber | html %]&method=phone&location=[% todayoverduesloo.location | html %]">Cancel notification</a> >+ <a href="branchoverdues.pl?action=remove&borrowernumber=[% todayoverduesloo.borrowernumber | uri %]&itemnumber=[% todayoverduesloo.itemnumber | uri %]&method=phone&location=[% todayoverduesloo.location | uri %]">Cancel notification</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >index 01e25b2943..fcef398891 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >@@ -21,10 +21,10 @@ > <table> > <caption> > [% IF ( reserved ) %] >- Reserve found for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">[% borrowernumber | html %]</a>). >+ Reserve found for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>). > [% END %] > [% IF ( waiting ) %] >- Item is marked waiting at [% branchname | html %] for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">[% borrowernumber | html %]</a>). >+ Item is marked waiting at [% branchname | html %] for [% name | html %] (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% borrowernumber | html %]</a>). > [% END %] > </caption> > <tr> >@@ -130,7 +130,7 @@ > <li>Item is already at destination library.</li> > [% END %] > [% IF ( errmsgloo.errwasreturned ) %] >- <li>Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% errmsgloo.patron.borrowernumber | html %]"> >+ <li>Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% errmsgloo.patron.borrowernumber | uri %]"> > [% errmsgloo.patron.firstname | html %] [% errmsgloo.patron.surname | html %] > ([% errmsgloo.patron.cardnumber | html %])</a> and has been returned.</li> > [% END %] >@@ -181,9 +181,9 @@ > </tr> > [% FOREACH trsfitemloo IN trsfitemloop %] > <tr> >- <td class="tf-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% trsfitemloo.biblionumber | html %]">[% trsfitemloo.title | html %]</a></td> >+ <td class="tf-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% trsfitemloo.biblionumber | uri %]">[% trsfitemloo.title | html %]</a></td> > <td class="tf-author">[% trsfitemloo.author | html %]</td> >- <td class="tf-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% trsfitemloo.biblionumber | html %]&itemnumber=[% trsfitemloo.itemnumber | html %]#item[% trsfitemloo.itemnumber | html %]">[% trsfitemloo.barcode | html %]</a></td> >+ <td class="tf-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% trsfitemloo.biblionumber | uri %]&itemnumber=[% trsfitemloo.itemnumber | uri %]#item[% trsfitemloo.itemnumber | uri %]">[% trsfitemloo.barcode | html %]</a></td> > <td class="tf-location">[% trsfitemloo.location | html %]</td> > <td class="tf-itemcallnumber">[% trsfitemloo.itemcallnumber | html %]</td> > <td class="tf-itemtype">[% ItemTypes.GetDescription( trsfitemloo.itemtype ) | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >index b598e188f8..dbad745f75 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt >@@ -72,7 +72,7 @@ > [% FOREACH note IN notes %] > <tr> > <td><input type="checkbox" name="issue_ids" value="[% note.issue_id | html %]"></td> >- <td>[% note.item.biblio.title | html %] - [% note.item.biblio.author | html %] (<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% note.item.biblionumber | html %]">[% note.item.barcode | html %]</a>)</td> >+ <td>[% note.item.biblio.title | html %] - [% note.item.biblio.author | html %] (<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% note.item.biblionumber | uri %]">[% note.item.barcode | html %]</a>)</td> > <td>[% note.note | html %]</td> > <td><span title="[% note.notedate | html %]">[% note.notedate | $KohaDates %]</span></td> > <td>[% INCLUDE 'patron-title.inc' patron => note.patron hide_patron_infos_if_needed=1 %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >index c05fd3c600..f59fcaa6fa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt >@@ -135,7 +135,7 @@ > </div> > <div class="col-sm-5 col-md-3"> > <p><a href="https://github.com/bywatersolutions/koha-offline-circulation/releases"><i class="fa fa-window-maximize"></i> Get desktop application</a></p> >- <p><a href="https://addons.mozilla.org/[% lang | html %]/firefox/addon/koct/"><i class="fa fa-firefox"></i> Get Firefox add-on</a></p> >+ <p><a href="https://addons.mozilla.org/[% lang | uri %]/firefox/addon/koct/"><i class="fa fa-firefox"></i> Get Firefox add-on</a></p> > </div> > </div> > </div> >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..87681ef3eb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -115,15 +115,15 @@ > [% END %] > > [% IF ( RESERVE_WAITING ) %] >- <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | html %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% reswaitingdate | $KohaDates %]</li> >+ <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% reswaitingdate | $KohaDates %]</li> > [% END %] > > [% IF ( RESERVED ) %] >- <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | html %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% resreservedate | $KohaDates %]</li> >+ <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% resborrowernumber | uri %]">[% resfirstname | html %] [% ressurname | html %]</a> ([% rescardnumber | html %]) at [% Branches.GetName( resbranchcode ) | html %] since [% resreservedate | $KohaDates %]</li> > [% END %] > > [% IF ( ISSUED_TO_ANOTHER ) %] >- <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) is checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issued_borrowernumber | html %]">[% issued_firstname | html %] [% issued_surname | html %]</a> ([% issued_cardnumber | html %]). >+ <li>Item <i>[% getTitleMessageIteminfo | html %]</i> ([% getBarcodeMessageIteminfo | html %]) is checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% issued_borrowernumber | uri %]">[% issued_firstname | html %] [% issued_surname | html %]</a> ([% issued_cardnumber | html %]). > [% IF CAN_user_circulate_force_checkout %] > Check in and check out? > [% END %] >@@ -656,7 +656,7 @@ No patron matched <span class="ex">[% message | html %]</span> > > [% IF ( warndeparture ) %] > <li><span class="circ-hlt">Expiration:</span> Patron's card will expire soon. >- Patron's card expires on [% expiry | $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | html %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]&categorycode=[% categorycode | html %]">Edit Details</a> >+ Patron's card expires on [% expiry | $KohaDates %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]&categorycode=[% categorycode | html %]">Edit Details</a> > > </li> > [% END %] >@@ -669,7 +669,7 @@ No patron matched <span class="ex">[% message | html %]</span> > > [% IF ( expired ) %] > <li><span class="circ-hlt">Expiration:</span> Patron's card has expired. >- [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | html %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]&categorycode=[% categorycode | html %]">Edit Details</a> >+ [% IF ( expiry ) %]Patron's card expired on [% expiry | $KohaDates %][% END %] <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&destination=circ&reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber | html %]&categorycode=[% categorycode | html %]">Edit Details</a> > > </li> > [% END %] >@@ -703,7 +703,7 @@ No patron matched <span class="ex">[% message | html %]</span> > <a class="btn btn-default btn-sm" href="#reldebarments" onclick="$('#debarments-tab-link').click()"><i class="fa fa-ban"></i> View restrictions</a> > [% IF (noissues && patron && CAN_user_circulate_force_checkout) %] > <span class="override_debarment"> >- <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&borrowernumber=[% patron.borrowernumber | html %]" class="btn btn-default btn-sm">Override restriction temporarily</a> >+ <a href="/cgi-bin/koha/circ/circulation.pl?forceallow=1&borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-sm">Override restriction temporarily</a> > </span> > [% END %] > </li> >@@ -741,7 +741,7 @@ No patron matched <span class="ex">[% message | html %]</span> > [% FOREACH w IN WaitingHolds %] > <ul> > <li> >- <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | html %]">[% w.biblio.title | html %]</a> >+ <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a> > ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]), > [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %] > [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %] >@@ -780,7 +780,7 @@ No patron matched <span class="ex">[% message | html %]</span> > [% message.message_date | $KohaDates %] > [% Branches.GetName( message.branchcode ) | html %] > [% IF message.manager_id %] >- ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.manager_id | html %]">[% message.get_column('manager_firstname') | html %] [% message.get_column('manager_surname') | html %]</a> ) >+ ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.manager_id | uri %]">[% message.get_column('manager_firstname') | html %] [% message.get_column('manager_surname') | html %]</a> ) > [% END %] > <i>"[% message.message | html %]"</i> > </span> >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..d45ffe8f3e 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 >@@ -116,7 +116,7 @@ > [% END %] > <td>[% checkout_info.barcode | html %]</td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.biblio.biblionumber | html %]&type=intra"><strong>[% checkout_info.biblio.title | html %][% FOREACH subtitle IN checkout_info.biblio.subtitles %] [% subtitle.subfield | html %][% END %]</strong></a>[% IF checkout_info.biblio.author %], by [% checkout_info.biblio.author | html %][% END %][% IF ( checkout_info.item.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes | html %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.biblio.biblionumber | html %]&itemnumber=[% checkout_info.item.itemnumber | html %]#item[% checkout_info.item.itemnumber | html %]">[% checkout_info.item.barcode | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout_info.biblio.biblionumber | uri %]&type=intra"><strong>[% checkout_info.biblio.title | html %][% FOREACH subtitle IN checkout_info.biblio.subtitles %] [% subtitle.subfield | html %][% END %]</strong></a>[% IF checkout_info.biblio.author %], by [% checkout_info.biblio.author | html %][% END %][% IF ( checkout_info.item.itemnotes ) %]- <span class="circ-hlt">[% checkout_info.item.itemnotes | html %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% checkout_info.biblio.biblionumber | html %]&itemnumber=[% checkout_info.item.itemnumber | html %]#item[% checkout_info.item.itemnumber | html %]">[% checkout_info.item.barcode | html %]</a> > </td> > <td> > [% IF checkout_info.NEEDSCONFIRMATION %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >index 5d3f618656..221ae8f49f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt >@@ -38,14 +38,14 @@ > [% IF item.is_overdue %]</span>[% END %] > </td> > <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber | html %]">[% item.firstname | html %] [% item.surname | html %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.borrowernumber | uri %]">[% item.firstname | html %] [% item.surname | html %]</a> > </td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber | html %]"><strong>[% item.title | html %]</strong></a>[% IF ( item.author ) %], by [% item.author | html %][% END %][% IF ( item.itemnotes ) %]- <span class="circ-hlt">[% item.itemnotes | html %]</span>[% END %] >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber | uri %]"><strong>[% item.title | html %]</strong></a>[% IF ( item.author ) %], by [% item.author | html %][% END %][% IF ( item.itemnotes ) %]- <span class="circ-hlt">[% item.itemnotes | html %]</span>[% END %] > </td> > <td>[% item.itemcallnumber | html %]</td> > <td> >- <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% item.biblionumber | html %]&itemnumber=[% item.itemnumber | html %]#item[% item.itemnumber | html %]">[% item.barcode | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% item.biblionumber | uri %]&itemnumber=[% item.itemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a> > </td> > <td>[% Branches.GetName(item.branchcode) | html %]</td> > <td>[% AuthorisedValues.GetByCode( 'LOC', item.location ) | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index 367cd35587..9295d94894 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -36,7 +36,7 @@ > > <p> > [% IF ( isfiltered ) %] >- <a href="overdue.pl?op=csv&[% csv_param_string | html %]">Download file of displayed overdues</a> >+ <a href="overdue.pl?op=csv&[% csv_param_string | uri %]">Download file of displayed overdues</a> > [% ELSE %] > <a href="overdue.pl?op=csv">Download file of all overdues</a> > [% END %] >@@ -65,12 +65,12 @@ > <td> > [% INCLUDE 'patron-title.inc' patron=overdueloo.patron hide_patron_infos_if_needed=1 link_to="circulation_reserves" %] > [% IF logged_in_user.can_see_patron_infos( overdueloo.patron ) %] >- [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email | html %]?subject=[% INCLUDE subject %] [% overdueloo.title | html %]">email</a>][% END %] >+ [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email | uri %]?subject=[% INCLUDE subject %] [% overdueloo.title | uri %]">email</a>][% END %] > [% IF ( overdueloo.phone ) %]([% overdueloo.phone | html %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile | html %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro | html %])[% END %]</td> > [% END %] > <td>[% Branches.GetName( overdueloo.patron.branchcode ) | html %]</td> > <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overdueloo.biblionumber %][% overdueloo.title | html %] [% overdueloo.subtitle | html %]</a> [% IF ( overdueloo.author ) %], by [% overdueloo.author | html %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron | html %][% END %]</td> >- <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% overdueloo.biblionumber | html %]&itemnumber=[% overdueloo.itemnum | html %]#item[% overdueloo.itemnum | html %]">[% overdueloo.barcode | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% overdueloo.biblionumber | uri %]&itemnumber=[% overdueloo.itemnum | uri %]#item[% overdueloo.itemnum | uri %]">[% overdueloo.barcode | html %]</a></td> > <td>[% overdueloo.itemcallnumber | html %]</td> > <td>[% overdueloo.replacementprice | $Price %]</td> > <td>[% overdueloo.itemnotes_nonpublic | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >index c6c71197cd..f9551ddd0a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt >@@ -74,7 +74,7 @@ > <td><p><b>[% reserveloo.pullcount | html %]</b></p></td> > <td>[% reserveloo.count | html %]</td> > <td>[% reserveloo.rcount | html %]</td> >- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber | html %]">[% reserveloo.firstname | html %] [% reserveloo.surname | html %]</a></td> >+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber | uri %]">[% reserveloo.firstname | html %] [% reserveloo.surname | html %]</a></td> > <td> > <p> > [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >index 39c6b70234..3e38f8fdca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >@@ -28,11 +28,11 @@ > > [% ELSIF error == "no_checkout" %] > >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblio.biblionumber | html %]">[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %]</a> ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | html %]&biblionumber=[% item.biblio.biblionumber | html %]&bi=[% item.biblioitemnumber.biblioitemnumber | html %]#item[% item.itemnumber | html %]">[% item.barcode | html %]</a> ) is not checked out to a patron.</p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblio.biblionumber | uri %]">[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %]</a> ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | html %]&biblionumber=[% item.biblio.biblionumber | html %]&bi=[% item.biblioitemnumber.biblioitemnumber | html %]#item[% item.itemnumber | html %]">[% item.barcode | html %]</a> ) is not checked out to a patron.</p> > > [% ELSIF error == "too_many" %] > >- <p>[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) has been renewed the maximum number of times by [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | html %]"> [% borrower.cardnumber | html %] </a> )</p> >+ <p>[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %] ( [% item.barcode | html %] ) has been renewed the maximum number of times by [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> )</p> > > [% IF Koha.Preference('AllowRenewalLimitOverride') %] > <form method="post" action="/cgi-bin/koha/circ/renew.pl"> >@@ -115,7 +115,7 @@ > > [% ELSIF error == "patron_restricted" %] > >- <p>[% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | html %]"> [% borrower.cardnumber | html %] </a> ) is currently restricted.</p> >+ <p>[% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> ) is currently restricted.</p> > > [% ELSE %] > >@@ -133,10 +133,10 @@ > <div class="dialog message"> > <h3>Item renewed:</h3> > <p> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblio.biblionumber | html %]">[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %]</a> >- ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | html %]&biblionumber=[% item.biblio.biblionumber | html %]&bi=[% item.biblioitemnumber.biblioitemnumber | html %]#item[% item.itemnumber | html %]">[% item.barcode | html %]</a> ) >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblio.biblionumber | uri %]">[% item.biblio.title | html %] [% item.biblioitem.subtitle | html %]</a> >+ ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber | uri %]&biblionumber=[% item.biblio.biblionumber | uri %]&bi=[% item.biblioitemnumber.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a> ) > renewed for >- [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | html %]"> [% borrower.cardnumber | html %] </a> ) >+ [% borrower.firstname | html %] [% borrower.surname | html %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]"> [% borrower.cardnumber | html %] </a> ) > now due on [% date_due | $KohaDates %] > </p> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >index a8c0a1c549..18c5d73820 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt >@@ -22,7 +22,7 @@ > <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> > [% UNLESS blocking_error %] > › >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]">[% biblio.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">[% biblio.title | html %]</a> > › > Request article > [% END %] >@@ -34,7 +34,7 @@ > <div id="yui-main"> > <div class="yui-b"> > >- <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id | html %]">[% biblio.title | html %]</a></h1> >+ <h1>Request article from <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.id | uri %]">[% biblio.title | html %]</a></h1> > [% IF no_patrons_found %] > <div class="dialog alert"> > <h3>Patron not found</h3> >@@ -243,7 +243,7 @@ > [% FOREACH ar IN biblio.article_requests_current %] > <tr> > <td>[% ar.created_on | $KohaDates %]</td> >- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% ar.borrowernumber | html %]">[% ar.borrower.firstname | html %] [% ar.borrower.surname | html %]</a></td> >+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% ar.borrowernumber | uri %]">[% ar.borrower.firstname | html %] [% ar.borrower.surname | html %]</a></td> > <td>[% ar.title | html %]</td> > <td>[% ar.author | html %]</td> > <td>[% ar.volume | html %]</td> >@@ -254,7 +254,7 @@ > <td>[% ar.patron_notes | html %]</td> > <td> > [% IF ar.item %] >- <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% ar.itemnumber | html %]&biblionumber=[% ar.biblionumber | html %]">[% ar.item.barcode | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% ar.itemnumber | uri %]&biblionumber=[% ar.biblionumber | uri %]">[% ar.item.barcode | html %]</a> > [% END %] > </td> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >index ecd444c73e..5073850d50 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt >@@ -92,7 +92,7 @@ > [% END %] > </ul> > </td> >- <td>[% IF ( reserveloo.thisratio_atleast1 ) %]<p>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc | html %] --><a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | html %]&booksellerid=[% booksellerid | html %]&basketno=[% basketno | html %]&rr_quantity_to_order=[% reserveloo.ratiocalc | html %]">[% END %]<b>[% reserveloo.ratiocalc | html %] to order</b>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]</a>[% END %] >+ <td>[% IF ( reserveloo.thisratio_atleast1 ) %]<p>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc | uri %] --><a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | uri %]&booksellerid=[% booksellerid | uri %]&basketno=[% basketno | uri %]&rr_quantity_to_order=[% reserveloo.ratiocalc | uri %]">[% END %]<b>[% reserveloo.ratiocalc | html %] to order</b>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]</a>[% END %] > [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders | html %] pending</b>[% END %]</p>[% END %]</td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 5763e97bdc..35be233fcb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -118,7 +118,7 @@ > [% IF ( collectionItemNeedsTransferred ) %] > <div id="rotating-collection" class="dialog message"> > <h3>Please transfer item to: [% Branches.GetName( collectionBranch ) | html %]</h3> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p> > <p>This item is part of a rotating collection.</p> > <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&branchcode=[% collectionBranch | html %]&op=slip"><i class="fa fa-print"></i> Print slip</button></p> > </div> >@@ -129,7 +129,7 @@ > <div class="dialog message"> > <h1>Patron note</h1> > <p>[% issue.notedate | $KohaDates %]</p> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber | html %]"> [% title | html %]</a> [% author | html %]</p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber | uri %]"> [% title | html %]</a> [% author | html %]</p> > <p>[% issue.note | html %]</p> > </div> > [% END %] >@@ -138,7 +138,7 @@ > [% IF ( fines ) %] > <div class="dialog alert"> > <h3>Patron has outstanding fines of [% fines | html %].</h3> >- <p><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% fineborrowernumber | html %]">Make payment</a>.</p> >+ <p><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% fineborrowernumber | uri %]">Make payment</a>.</p> > </div> > [% END %] > >@@ -146,7 +146,7 @@ > [% IF ( waiting_holds ) %] > <div id="awaiting-pickup" class="dialog message"> > <h3>[% holdsfirstname | html %] [% holdssurname | html %] has [% waiting_holds | html %] hold(s) waiting for pickup.</h3> >- <p><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% holdsborrowernumber | html %]">Check out to this patron</a>.</p> >+ <p><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% holdsborrowernumber | uri %]">Check out to this patron</a>.</p> > </div> > [% END %] > >@@ -154,7 +154,7 @@ > [% IF return_date_was_overriden && Borrowers.IsDebarred( borrower ) %] > <div id="restricted_backdated" class="dialog message"> > <h3> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]"> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]"> > [% patron.firstname | html %] [% patron.surname | html %] > </a> > is restricted. Please verify this patron should still be restricted. >@@ -164,7 +164,7 @@ > > [% IF ( wrongbranch ) %] > <div class="dialog alert"><h3>Cannot check in</h3> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p> > </p><strong>NOT CHECKED IN</strong></p> > <p>This item must be checked in at following library: <strong>[% Branches.GetName( rightbranch ) | html %]</strong></p> > </div> >@@ -175,12 +175,12 @@ > <div id="return2" class="dialog message"> > <!-- WrongTransfer --> > <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]</h3> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p> > <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&&branchcode=[% TransferWaitingAt | html %]&op=slip"><i class="fa fa-print"></i> Print transfer slip</button> > <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber | html %]&canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button> > [% IF ( patron.cardnumber ) %]<h5>Hold for:</h5> > <ul> >- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]"> >+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]"> > [% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span> </li> > [% INCLUDE display_holdpatron_address %] > [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %] >@@ -212,7 +212,7 @@ > <h3> > Hold found (item is already waiting): > <br/> >- <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | html %]"> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]"> > [% itembarcode | html %]: [% title | html %] > </a> > </h3> >@@ -226,7 +226,7 @@ > <h4>Hold for:</h4> > <ul> > <li> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) > <span class="patron-category"> - [% patron.category.description | html %]</span> > </li> > [% INCLUDE display_holdpatron_address %] >@@ -298,10 +298,10 @@ > <!-- diffbranch --> > <div id="transfer-needed" class="dialog message audio-alert-action"> > <h3>Hold needing transfer found</h3> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p> > <h4>Hold for: </h4> > <ul> >- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span> </li> >+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.surname | html %], [% patron.firstname | html %]</a> ([% patron.cardnumber | html %]) <span class="patron-category"> - [% patron.category.description | html %]</span> </li> > [% INCLUDE display_holdpatron_address %] > [% IF ( patron.phone ) %]<li>[% patron.phone | html %]</li>[% END %] > [% IF ( patron.email ) %]<li>[% IF ( transfertodo ) %][% patron.email | html %][% ELSE %]<a id="boremail" href="mailto:[% patron.email | html %]">[% patron.email | html %]</a>[% END %]</li>[% END %] >@@ -341,7 +341,7 @@ > <!-- transfer: item with no reservation, must be returned according to home library circulation rules --> > <div id="return1" class="dialog message audio-alert-action"> > <h3>Please return item to: [% Branches.GetName( returnbranch ) | html %]</h3> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p> > <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&branchcode=[% returnbranch | html %]&op=slip"><i class="fa fa-print"></i> Print slip</button></p> > </div> > [% END %] >@@ -376,7 +376,7 @@ > <!-- diffbranch --> > <h3 class="audio-alert-action">Item consigned:</h3> > <table> >- <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | html %]">[% title | html %]</a></caption> >+ <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% title | html %]</a></caption> > <tr> > <th>Hold for:</th> > <td>[% INCLUDE 'patron-title.inc' patron=patron %]</td> >@@ -410,7 +410,7 @@ > <h3> > Hold found: > <br/> >- <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | html %]"> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]"> > [% itembarcode | html %]: [% title | html %] > </a> > </div> >@@ -512,7 +512,7 @@ > <div class="dialog alert audio-alert-warning"> > <h3>Check in message</h3> > [% IF itembiblionumber %] >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | html %]">[% itembarcode | html %]: [% title | html %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber | uri %]">[% itembarcode | html %]: [% title | html %]</a></p> > [% END %] > [% FOREACH errmsgloo IN errmsgloop %] > [% IF ( errmsgloo.NotForLoanStatusUpdated ) %] >@@ -568,7 +568,7 @@ > <p class="problem">Item is withdrawn.</p> > [% END %] > [% IF ( errmsgloo.debarred ) %] >- <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber | html %]">[% errmsgloo.debarname | html %]([% errmsgloo.debarcardnumber | html %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p> >+ <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber | uri %]">[% errmsgloo.debarname | html %]([% errmsgloo.debarcardnumber | html %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p> > [% END %] > [% IF ( errmsgloo.prevdebarred ) %] > <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p> >@@ -695,7 +695,7 @@ > [% ELSE %]Not checked out > [% END %] > </td> >- <td class="ci-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% riloo.itembiblionumber | html %]"> >+ <td class="ci-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% riloo.itembiblionumber | uri %]"> > [% riloo.itemtitle | html %] > </a> > [% IF ( riloo.enumchron ) %] >@@ -704,7 +704,7 @@ > [% END %] > </td> > <td class="ci-author">[% riloo.itemauthor | html %]</td> >- <td class="ci-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber | html %]&itemnumber=[% riloo.itemnumber | html %]#item[% riloo.itemnumber | html %]">[% riloo.barcode | html %]</a></td> >+ <td class="ci-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber | uri %]&itemnumber=[% riloo.itemnumber | uri %]#item[% riloo.itemnumber | uri %]">[% riloo.barcode | html %]</a></td> > <td class="ci-homelibrary">[% Branches.GetName( riloo.homebranch ) | html %]</td> > <td class="ci-holdinglibrary">[% Branches.GetName( riloo.holdingbranch ) | html %]</td> > <td class="ci-shelvinglocation">[% riloo.location | html %]</td> >@@ -712,14 +712,14 @@ > <td class="ci-dateaccessioned">[% riloo.dateaccessioned | $KohaDates %]</td> > <td class="ci-type">[% ItemTypes.GetDescription( riloo.itemtype ) | html %] [% AuthorisedValues.GetByCode('CCODE', riloo.ccode) | html %]</td> > <td class="ci-patron">[% IF ( riloo.duedate ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.patron.borrowernumber | html %]"> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% riloo.patron.borrowernumber | uri %]"> > [% riloo.patron.surname | html %], [% riloo.patron.firstname | html %] ([% riloo.patron.category.description | html %]) > </a> > [% IF riloo.borissuescount %] > <span class="results_summary nowrap"> > <span class="label">Checkouts:</span> > <span class="number_box"> >- <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% riloo.patron.borrowernumber | html %]">[% riloo.borissuescount | html %]</a> >+ <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% riloo.patron.borrowernumber | uri %]">[% riloo.borissuescount | html %]</a> > </span> > </span> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >index 8e819c23d7..66e0683564 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt >@@ -53,14 +53,14 @@ > <br />Barcode: [% reser.barcode | html %] > </td> > <td>[% IF ( reser.patron ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.patron.borrowernumber | html %]"> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.patron.borrowernumber | uri %]"> > [% reser.patron.surname | html %][%IF ( reser.patron.firstname ) %], [% reser.patron.firstname | html %][% END %] > </a> > [% IF ( reser.patron.phone ) %]<br />[% reser.patron.phone | html %][% END %] > [% IF ( reser.patron.first_valid_email_address ) %] > <br /> > [% BLOCK subject %]Hold:[% END %] >- <a href="mailto:[% reser.patron.first_valid_email_address | html %]?subject=[% INCLUDE subject %] [% reser.title | html %]"> >+ <a href="mailto:[% reser.patron.first_valid_email_address | uri %]?subject=[% INCLUDE subject %] [% reser.title | uri %]"> > [% reser.patron.first_valid_email_address | html %] > </a> > [% END %] >@@ -70,7 +70,7 @@ > </td> > <td>[% IF reser.homebranch %][% Branches.GetName( reser.homebranch ) | html %][% END %]</td> > <td>[% reser.itemcallnumber | html %]</td> >- <td class="actions"><a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% reser.itemnumber | html %]&canceltransfer=1&dest=ttr" class="btn btn-default btn-xs"><i class="fa fa-times"></i> Cancel transfer</a></td> >+ <td class="actions"><a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% reser.itemnumber | uri %]&canceltransfer=1&dest=ttr" class="btn btn-default btn-xs"><i class="fa fa-times"></i> Cancel transfer</a></td> > </tr> > [% END %]</tbody> > </table> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >index e2bb802897..07b9657969 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >@@ -119,7 +119,7 @@ > <tbody>[% FOREACH itemsloo IN itemsloop %] > <tr> > <td class="hq-title"> >- <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemsloo.biblionumber | html %]"><strong>[% itemsloo.title | html %]</strong> [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]</a></p> >+ <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itemsloo.biblionumber | uri %]"><strong>[% itemsloo.title | html %]</strong> [% FOREACH s IN itemsloo.subtitle %] [% s | html %][% END %]</a></p> > <p> > <div class="hq-biblionumber content_hidden">[% itemsloo.biblionumber | html %]</div> > <div class="hq-author">[% itemsloo.author | html %]</div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >index 8c442941da..c7850d4913 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt >@@ -28,7 +28,7 @@ > > <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %] > [% IF ( all_branches_link ) %] >- <span style="margin-left:20px"><a href="[% all_branches_link | html %]"> >+ <span style="margin-left:20px"><a href="[% all_branches_link | uri %]"> > View all libraries</a></span> > [% END %] > </h2> >@@ -92,9 +92,9 @@ > [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %] (<b>[% reserveloo.itemtype | html %]</b>)[% END %][% END %] > <br />Barcode: [% reserveloo.barcode | html %] > </td> >- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.patron.borrowernumber | html %]">[% reserveloo.patron.surname | html %], [% reserveloo.patron.firstname | html %]</a> >+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.patron.borrowernumber | uri %]">[% reserveloo.patron.surname | html %], [% reserveloo.patron.firstname | html %]</a> > [% IF ( reserveloo.patron.phone ) %]<br />[% reserveloo.patron.phone | html %][% END %] >- [% IF ( reserveloo.patron.first_valid_email_address ) %]<br /><a href="mailto:[% reserveloo.patron.first_valid_email_address | html %]?subject=Hold waiting: [% reserveloo.title | html %]"> >+ [% IF ( reserveloo.patron.first_valid_email_address ) %]<br /><a href="mailto:[% reserveloo.patron.first_valid_email_address | uri %]?subject=Hold waiting: [% reserveloo.title | uri %]"> > [% reserveloo.patron.first_valid_email_address | html %]</a>[% END %] > </td> > <td>[% Branches.GetName( reserveloo.homebranch ) | html %]</td> >@@ -163,8 +163,8 @@ > [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %] (<b>[% overloo.itemtype | html %]</b>)[% END %][% END %] > <br />Barcode: [% overloo.barcode | html %] > </td> >- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.patron.borrowernumber | html %]">[% overloo.patron.surname | html %], [% overloo.patron.firstname | html %]</a><br />[% overloo.patron.phone | html %]<br /> >- [% IF ( overloo.patron.first_valid_email_address ) %]<a href="mailto:[% overloo.patron.first_valid_email_address | html %]?subject=Reservation: [% overloo.title |url %]"> >+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.patron.borrowernumber | uri %]">[% overloo.patron.surname | html %], [% overloo.patron.firstname | html %]</a><br />[% overloo.patron.phone | html %]<br /> >+ [% IF ( overloo.patron.first_valid_email_address ) %]<a href="mailto:[% overloo.patron.first_valid_email_address | uri %]?subject=Reservation: [% overloo.title |url %]"> > [% overloo.patron.first_valid_email_address | html %]</a>[% END %] > </td> > <td>[% Branches.GetName( overloo.homebranch ) | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >index 7cf9165d0f..bdcccd0164 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt >@@ -35,7 +35,7 @@ > [% SET p = e.patron %] > <tr> > <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% p.id | html %]">[% p.surname | html %], [% p.firstname | html %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% p.id | uri %]">[% p.surname | html %], [% p.firstname | html %]</a> > </td> > <td> > [% p.cardnumber | html %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >index 0e3ba3e635..1dff30d309 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt >@@ -113,7 +113,7 @@ > [% END %] > <ul class="dropdown-menu"> > [% FOREACH t IN club_templates %] >- <li><a href="/cgi-bin/koha/clubs/clubs-add-modify.pl?club_template_id=[% t.id | html %]">[% t.name | html %]</a></li> >+ <li><a href="/cgi-bin/koha/clubs/clubs-add-modify.pl?club_template_id=[% t.id | uri %]">[% t.name | html %]</a></li> > [% END %] > </ul> > </div> >@@ -178,20 +178,20 @@ > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="clubactions[% c.id | html %]"> > [% IF ( c.club_enrollments.count ) %] > <li> >- <a href="club-enrollments.pl?id=[% c.id | html %]"> >+ <a href="club-enrollments.pl?id=[% c.id | uri %]"> > <i class="fa fa-list-ul"></i> Enrollments > </a> > </li> > [% ELSE %] > <li class="disabled"> >- <a href="club-enrollments.pl?id=[% c.id | html %]"> >+ <a href="club-enrollments.pl?id=[% c.id | uri %]"> > <i class="fa fa-list-ul"></i> Enrollments > </a> > </li> > [% END %] > [% IF CAN_user_clubs_edit_clubs %] > <li> >- <a href="clubs-add-modify.pl?id=[% c.id | html %]"> >+ <a href="clubs-add-modify.pl?id=[% c.id | uri %]"> > <i class="fa fa-pencil"></i> Edit > </a> > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >index 24c1cac51b..fb8b71fd32 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt >@@ -38,7 +38,7 @@ > <fieldset class="action"> > <input type="submit" value="Submit" class="submit" /> > >- <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]" class="cancel">Cancel</a> >+ <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | uri %]" class="cancel">Cancel</a> > </fieldset> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >index 0d9359e2c4..669be49ced 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt >@@ -109,7 +109,7 @@ > <fieldset class="action"> > <input type="submit" id="submit" value="Save" class="submit focus" /> > >- <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]" class="cancel">Cancel</a> >+ <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | uri %]" class="cancel">Cancel</a> > </fieldset> > </form> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt >index bc1fa9cf63..ce67aab3ff 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt >@@ -94,7 +94,7 @@ > <fieldset class="action"> > <input type="submit" value="Submit" class="submit" /> > >- <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | html %]" class="cancel">Cancel</a> >+ <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course.course_id | uri %]" class="cancel">Cancel</a> > </fieldset> > </form> > [% END %] >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 107e7fdab7..f7984731ef 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 >@@ -45,7 +45,7 @@ > <li><span class="label">Department</span> [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) | html %]</li> > <li><span class="label">Course number</span> [% course.course_number | html %]</li> > <li><span class="label">Section</span> [% course.section | html %]</li> >- <li><span class="label">Instructors</span> [% FOREACH i IN course.instructors %]<div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber | html %]">[% i.firstname | html %] [% i.surname | html %]</a></div>[% END %]</li> >+ <li><span class="label">Instructors</span> [% FOREACH i IN course.instructors %]<div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber | uri %]">[% i.firstname | html %] [% i.surname | html %]</a></div>[% END %]</li> > <li><span class="label">Staff note</span> [% course.staff_note | html %]</li> > <li><span class="label">Public note</span> [% course.public_note | html %]</li> > <li><span class="label">Student count</span> [% course.students_count | html %]</li> >@@ -79,9 +79,9 @@ > <tbody> > [% FOREACH cr IN course_reserves %] > <tr> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cr.biblio.biblionumber | html %]">[% cr.biblio.title | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% cr.biblio.biblionumber | uri %]">[% cr.biblio.title | html %]</a></td> > <td>[% cr.biblio.author | html %]</td> >- <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% cr.item.itemnumber | html %]&biblionumber=[% cr.biblio.biblionumber | html %]&bi=[% cr.biblioitem.biblioitemnumber | html %]">[% cr.item.barcode | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% cr.item.itemnumber | uri %]&biblionumber=[% cr.biblio.biblionumber | uri %]&bi=[% cr.biblioitem.biblioitemnumber | uri %]">[% cr.item.barcode | html %]</a></td> > <td>[% cr.item.itemcallnumber | html %]</td> > [% IF item_level_itypes %] > <td> >@@ -156,9 +156,9 @@ > > <td> > [% IF (cr.item.uri) %] >- <a href="[% cr.item.uri | html %]">Item URI</a> >+ <a href="[% cr.item.uri | uri %]">Item URI</a> > [% ELSIF (cr.biblioitem.url) %] >- <a href="[% cr.biblioitem.url | html %]">Record URL</a> >+ <a href="[% cr.biblioitem.url | uri %]">Record URL</a> > [% END %] > </td> > >@@ -166,7 +166,7 @@ > [% FOREACH c IN cr.courses %] > [% UNLESS cr.course_id == c.course_id %] > <p> >- <a href="course-details.pl?course_id=[% c.course_id | html %]"> >+ <a href="course-details.pl?course_id=[% c.course_id | uri %]"> > [% c.course_name | html %] > [% IF c.section %] [% c.section | html %] [% END %] > [% IF c.term %] [% AuthorisedValues.GetByCode( 'TERM', c.term ) | html %] [% 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 b1917a4cb8..a747b9e03e 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 >@@ -70,14 +70,14 @@ > <tbody> > [% FOREACH c IN courses %] > <tr> >- <td><a href="course-details.pl?course_id=[% c.course_id | html %]">[% c.course_name | html %]</a></td> >+ <td><a href="course-details.pl?course_id=[% c.course_id | uri %]">[% c.course_name | html %]</a></td> > <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department ) | html %]</td> > <td>[% c.course_number | html %]</td> > <td>[% c.section | html %]</td> > <td>[% AuthorisedValues.GetByCode( 'TERM' c.term ) | html %]</td> > <td> > [% FOREACH i IN c.instructors %] >- <div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber | html %]">[% i.firstname | html %] [% i.surname | html %]</a></div> >+ <div class="instructor"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% i.borrowernumber | uri %]">[% i.firstname | html %] [% i.surname | html %]</a></div> > [% END %] > </td> > <td>[% c.staff_note | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >index e2f25b4595..00747ab6ae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt >@@ -118,7 +118,7 @@ > <input type="submit" value="Save" class="submit" /> > > [% IF course_id %] >- <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course_id | html %]" class="cancel">Cancel</a> >+ <a href="/cgi-bin/koha/course_reserves/course-details.pl?course_id=[% course_id | uri %]" class="cancel">Cancel</a> > [% ELSE %] > <a href="/cgi-bin/koha/course_reserves/course-reserves.pl" class="cancel">Cancel</a> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt >index 5cbed4e40f..49e3fb12b4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt >@@ -26,7 +26,7 @@ > <h3>What's next?</h3> > <ul style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 1px solid #CCC;"> > <li>Use top menu bar to navigate to another part of Koha.</li> >- <li>To report a broken link or any other issue, please contact the Koha Administrator. <a href="mailto:[% admin | html %]">Send email</a></li> >+ <li>To report a broken link or any other issue, please contact the Koha Administrator. <a href="mailto:[% admin | uri %]">Send email</a></li> > </ul> > </div> > >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..23112fdbf9 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 >@@ -393,7 +393,7 @@ > </fieldset> > <fieldset class="action"> > <input type="submit" class="btn btn-default" value="Send email"/> >- <span><a href="[% ill_url | html %]" title="Return to request details">Cancel</a></span> >+ <span><a href="[% ill_url | uri %]" title="Return to request details">Cancel</a></span> > </fieldset> > </form> > [% ELSE %] >@@ -401,7 +401,7 @@ > <legend>Interlibrary loan request details</legend> > <p>No partners have been defined yet. Please create appropriate patron records (by default ILLLIBS category).</p> > <p>Be sure to provide email addresses for these patrons.</p> >- <p><span><a href="[% ill_url | html %]" title="Return to request details">Cancel</a></span></p> >+ <p><span><a href="[% ill_url | uri %]" title="Return to request details">Cancel</a></span></p> > </fieldset> > [% END %] > <!-- generic_confirm ends here --> >@@ -518,7 +518,7 @@ > <div class="borrowernumber"> > <span class="label borrowernumber">Patron:</span> > [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %] >- <a href="[% borrowerlink | html %]" title="View borrower details"> >+ <a href="[% borrowerlink | uri %]" title="View borrower details"> > [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %] > </a> > </div> >@@ -526,7 +526,7 @@ > <div class="biblio_id"> > <span class="label biblio_id">Bibliographic record ID:</span> > [% IF request.biblio_id %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | html %]">[% request.biblio_id | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | uri %]">[% request.biblio_id | html %]</a> > [% ELSE %] > <span>N/A</span> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index d6d2022d21..ab04abbcd9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -25,7 +25,7 @@ > <div class="newsbody">[% koha_new.content | $raw %]</div> > <p class="newsfooter"> Posted on [% koha_new.newdate | html %][% IF( ( newsdisp == 'staff' || newsdisp == 'both' ) && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title | html %] </span>[% koha_new.author_firstname | html %] [% koha_new.author_surname | html %]<br />[% END %] > [% IF ( CAN_user_tools ) %] >- <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=[% koha_new.idnew | html %]">Edit</a> >+ <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=[% koha_new.idnew | uri %]">Edit</a> > | <a class="news_delete" href="/cgi-bin/koha/tools/koha-news.pl?op=del&ids=[% koha_new.idnew | html %]">Delete</a> > | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >index e5df6b84c4..dc5ad32a74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt >@@ -52,7 +52,7 @@ > > [% IF ( accountline.itemnumber ) %] > [% SET biblio = accountline.item.biblio %] >- <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | html %]&itemnumber=[% accountline.itemnumber | html %]">[% biblio.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]&itemnumber=[% accountline.itemnumber | uri %]">[% biblio.title | html %]</a> > [% END %] > </td> > >@@ -111,11 +111,11 @@ > <td>[% offset_accountline.amountoutstanding | $Price %]</td> > <td>[% INCLUDE 'accounttype.inc' account => offset_accountline %]</td> > <td>[% offset_accountline.note | html %]</td> >- <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | html %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td> >+ <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td> > <td>[% ao.created_on | $KohaDates with_hours => 1 | html %]</td> > <td>[% ao.amount | $Price %]</td> > <td>[% INCLUDE 'account_offset_type.inc' account_offset => ao %]</td> >- <td><a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | html %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a></td> >+ <td><a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a></td> > </tr> > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >index a27937ee99..44015bb14c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt >@@ -31,10 +31,10 @@ > <!-- The manual invoice and credit buttons --> > <div class="statictabs"> > <ul> >- <li class="active"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Account</a></li> >- <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]" >Pay fines</a></li> >- <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual invoice</a></li> >- <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual credit</a></li> >+ <li class="active"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a></li> >+ <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Pay fines</a></li> >+ <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li> >+ <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li> > </ul> > <div class="tabs-container"> > <!-- The table with the account items --> >@@ -64,7 +64,7 @@ > [% INCLUDE 'accounttype.inc' accountline => account %] > [%- IF account.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %] > [%- IF account.description %], [% account.description | html %][% END %] >- [% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | html %]&itemnumber=[% account.itemnumber | html %]">[% account.item.biblio.title | html %]</a>[% END %]</td> >+ [% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>[% END %]</td> > <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td> > <td>[% account.note | html_line_break %]</td> > [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td> >@@ -75,14 +75,14 @@ > [% ELSE %] > <a target="_blank" href="printinvoice.pl?action=print&accountlines_id=[% account.accountlines_id | html %]&borrowernumber=[% account.borrowernumber | html %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a> > [% END %] >- <a href="accountline-details.pl?accountlines_id=[% account.accountlines_id | html %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a> >+ <a href="accountline-details.pl?accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a> > [% IF ( reverse_col) %] > [% IF ( account.payment || account.amount < 0 ) %] > [% IF account.payment %] >- <a href="boraccount.pl?action=reverse&accountlines_id=[% account.accountlines_id | html %]&borrowernumber=[% account.borrowernumber | html %]" class="btn btn-default btn-xs"><i class="fa fa-undo"></i> Reverse</a> >+ <a href="boraccount.pl?action=reverse&accountlines_id=[% account.accountlines_id | uri %]&borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-undo"></i> Reverse</a> > [% END %] > [% IF account.amount < 0 %] >- <a href="boraccount.pl?action=void&accountlines_id=[% account.accountlines_id | html %]&borrowernumber=[% account.borrowernumber | html %]" class="btn btn-default btn-xs void"><i class="fa fa-ban"></i> Void</a> >+ <a href="boraccount.pl?action=void&accountlines_id=[% account.accountlines_id | uri %]&borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs void"><i class="fa fa-ban"></i> Void</a> > [% END %] > [% ELSE %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >index f65bddc4de..c2b271f948 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt >@@ -33,7 +33,7 @@ > <tbody> > [% FOREACH d IN pending_discharges %] > <tr> >- <td><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% d.borrower.borrowernumber | html %]">[% d.borrower.surname | html %], [% d.borrower.firstname | html %]</a></td> >+ <td><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% d.borrower.borrowernumber | uri %]">[% d.borrower.surname | html %], [% d.borrower.firstname | html %]</a></td> > <td>[% d.borrower.branchcode.branchname | html %]</td> > <td><span title="[% d.needed | html %]">[% d.needed | $KohaDates %]</span></td> > <td><a class="btn btn-xs btn-default" href="/cgi-bin/koha/members/discharges.pl?op=allow&borrowernumber=[% d.borrower.borrowernumber | html %]"><i class="fa fa-check"></i> Allow</a></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >index 027b563ac0..05230c69fa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt >@@ -45,7 +45,7 @@ > <tbody> > [% FOREACH f IN files %] > <tr> >- <td><a href="?borrowernumber=[% patron.borrowernumber | html %]&op=download&file_id=[% f.file_id | html %]">[% f.file_name | html %]</a></td> >+ <td><a href="?borrowernumber=[% patron.borrowernumber | uri %]&op=download&file_id=[% f.file_id | uri %]">[% f.file_name | html %]</a></td> > <td>[% f.file_type | html %]</td> > <td>[% f.file_description | html %]</td> > <td>[% f.date_uploaded | $KohaDates %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >index 047f19e798..1140b7ad51 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt >@@ -54,7 +54,7 @@ > </thead> > <tbody> > [% FOREACH hold IN holds %] >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblio.biblionumber | html %]">[% hold.biblio.title | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% hold.biblio.biblionumber | uri %]">[% hold.biblio.title | html %]</a></td> > <td>[% hold.biblio.author | html %]</td> > <td>[% hold.item.barcode | html %]</td> > <td>[% Branches.GetName( hold.branchcode ) | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >index 4fb644ce22..60d848921e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt >@@ -390,12 +390,12 @@ > <td>[% entry.id | html %]</td> > <td>[% entry.appointment_date | $KohaDates %] ([% entry.day_segment | html %])</td> > <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.chooser.borrowernumber | html %]"> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.chooser.borrowernumber | uri %]"> > [% INCLUDE 'patron-title.inc' patron = entry.chooser invert_name = 0 %] > </a> > </td> > <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.deliverer.borrowernumber | html %]"> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.deliverer.borrowernumber | uri %]"> > [% INCLUDE 'patron-title.inc' patron = entry.deliverer invert_name = 0 %] > </a> > </td> >@@ -408,7 +408,7 @@ > </table> > [% END %] > <div class="action"> >- <a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% patron.borrowernumber | html %]" >+ <a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% patron.borrowernumber | uri %]" > class="btn btn-default btn-sm"> > <i class="fa fa-plus"></i> Add a new delivery > </a> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >index e935fbb3d6..c02943d96c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt >@@ -24,10 +24,10 @@ > <!-- The manual invoice and credit buttons --> > <div class="statictabs"> > <ul> >- <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Account</a></li> >- <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]" >Pay fines</a></li> >- <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual invoice</a></li> >- <li class="active"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual credit</a></li> >+ <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a></li> >+ <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Pay fines</a></li> >+ <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li> >+ <li class="active"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li> > </ul> > <div class="tabs-container"> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >index e011681050..3014227bae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt >@@ -24,10 +24,10 @@ > <!-- The manual invoice and credit buttons --> > <div class="statictabs"> > <ul> >- <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Account</a></li> >- <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]" >Pay fines</a></li> >- <li class="active"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual invoice</a></li> >- <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual credit</a></li> >+ <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a></li> >+ <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Pay fines</a></li> >+ <li class="active"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li> >+ <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li> > </ul> > <div class="tabs-container"> > >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..5c27430092 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -26,7 +26,7 @@ > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> > [% UNLESS blocking_error %] >- ›[% IF (firstname || surname ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">[% IF (firstname) %][% firstname | html %] [% END %][% IF (surname) %][% surname | html %] [% END %]</a> ›[% END %] >+ ›[% IF (firstname || surname ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | uri %]">[% IF (firstname) %][% firstname | html %] [% END %][% IF (surname) %][% surname | html %] [% END %]</a> ›[% END %] > <strong>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron ([%IF ( categoryname ) %][% categoryname | html %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</strong> > [% END %] > </div> >@@ -326,7 +326,7 @@ > [% ELSE %] > <li id="contact-details" style="display: none"> > [% END %] >- <span class="label">Organization #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid | html %]" target="blank">[% guarantorid | html %]</a>[% END %] >+ <span class="label">Organization #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid | uri %]" target="blank">[% guarantorid | html %]</a>[% END %] > </li> > <li> > <label for="contactname">Organization name: </label> >@@ -347,7 +347,7 @@ > <span class="label">Patron #:</span> > [% IF guarantorid %] > [% IF logged_in_user.can_see_patron_infos( guarantor ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid | html %]" target="blank">[% guarantorid | html %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid | uri %]" target="blank">[% guarantorid | html %]</a> > [% ELSE %] > [% guarantorid | html %] > [% END %] >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..a981740acd 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 @@ > <div id="pending_updates"> > [% FOREACH pm IN PendingModifications %] > [% SET borrowernumber = pm.borrowernumber %] >- <h3><a href="#panel_modify_[% pm.borrowernumber | 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 | html %]</a></h3> >+ <h3><a href="#panel_modify_[% pm.borrowernumber | uri %]">[% 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 %]</a></h3> > <div id="panel_modify_[% pm.borrowernumber | html %]"> > <div style="background-color:#E6F0F2;padding:.5em;margin:.3em 0;"> > <input type="radio" id="approve_modify_[% pm.borrowernumber | html %]" name="modify_[% pm.borrowernumber | html %]" value="approve" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >index 1c257c0c1d..0ae464498b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >@@ -105,7 +105,7 @@ > <div class="dialog alert">No valid patrons to merge were found.</div> > [% ELSE %] > <p> >- Patron records merged into <a href="moremember.pl?borrowernumber=[% keeper.id | html %]">[% INCLUDE 'patron-title.inc' patron = keeper %]</a> >+ Patron records merged into <a href="moremember.pl?borrowernumber=[% keeper.id | uri %]">[% INCLUDE 'patron-title.inc' patron = keeper %]</a> > </p> > > [% FOREACH pair IN results.merged.pairs %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt >index 0c3a51793c..dab14e5ede 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt >@@ -35,8 +35,8 @@ > [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro | html %]</li>[% END %] > [% IF ( mobile ) %]<li><span class="label">Other phone: </span>[% mobile | html %]</li>[% END %] > [% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax | html %]</li>[% END %] >- [% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a href="mailto:[% email | html %]">[% email | html %]</a></li>[% END %] >- [% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a href="mailto:[% emailpro | html %]">[% emailpro | html %]</a></li>[% END %] >+ [% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a href="mailto:[% email | uri %]">[% email | html %]</a></li>[% END %] >+ [% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a href="mailto:[% emailpro | uri %]">[% emailpro | html %]</a></li>[% END %] > [% UNLESS ( I ) %] > [% IF ( inititals ) %]<li><span class="label">Initials: </span>[% initials | html %]</li>[% END %] > [% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth | $KohaDates %]</li>[% END %] >@@ -44,11 +44,11 @@ > [% END %] > [% IF ( isguarantee ) %] > [% IF ( guaranteeloop ) %] >- <li><span class="label">Guarantees:</span><ul>[% FOREACH guaranteeloo IN guaranteeloop %]<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guaranteeloo.borrowernumber | html %]">[% guaranteeloo.name | html %] </a></li>[% END %]</ul></li> >+ <li><span class="label">Guarantees:</span><ul>[% FOREACH guaranteeloo IN guaranteeloop %]<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guaranteeloo.borrowernumber | uri %]">[% guaranteeloo.name | html %] </a></li>[% END %]</ul></li> > [% END %] > [% ELSE %] > [% IF ( guarantor.borrowernumber ) %] >- <li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | html %]">[% guarantor.surname | html %], [% guarantor.firstname | html %]</a></li> >+ <li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | uri %]">[% guarantor.surname | html %], [% guarantor.firstname | html %]</a></li> > [% END %] > [% END %] > </ol> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >index d20a81eec5..9deff583ef 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt >@@ -10,7 +10,7 @@ > > <body id="pat_moremember-print" class="pat"> > <div id="main"> >- <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% patron.cardnumber | html %]">Account summary: [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a></h3> >+ <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% patron.cardnumber | uri %]">Account summary: [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a></h3> > > <ul> > [% IF Koha.Preference( 'AddressFormat' ) %] >@@ -48,7 +48,7 @@ > [% IF ( issue.overdue ) %]<tr class="overdue">[% ELSE %]<tr>[% END %] > <td> > [% issue.title | html %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issue.itemnumber | html %]&biblionumber=[% issue.biblionumber | html %]&bi=[% issue.biblioitemnumber | html %]"></a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issue.itemnumber | uri %]&biblionumber=[% issue.biblionumber | uri %]&bi=[% issue.biblioitemnumber | uri %]"></a> > </td> > <td>[% issue.author | html %]</td> > <td>[% issue.itemcallnumber | html %]</td> >@@ -118,7 +118,7 @@ > [% END %] > > [% IF ( account.itemnumber AND account.accounttype != 'F' AND account.accounttype != 'FU' ) %] >- <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | html %]&itemnumber=[% account.itemnumber | html %]">[% account.item.biblio.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a> > [% END %] > </td> > <td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >index 1f8ae04aae..c645c55af1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt >@@ -17,7 +17,7 @@ > <h3>[% LibraryName | html %]</h3> > [% IF ( branchname ) %][% branchname | html %]<br />[% END %] > Checked out to [% firstname | html %] [% surname | html %] <br /> >-(<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber | html %]">[% cardnumber | html %]</a>)<br /> >+(<a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber | uri %]">[% cardnumber | html %]</a>)<br /> > > [% todaysdate | html %]<br /> > >@@ -26,7 +26,7 @@ Checked out to [% firstname | html %] [% surname | html %] <br /> > [% FOREACH issueloo IN issueloop %] > [% IF ( issueloo.red ) %][% ELSE %] > [% IF ( issueloo.today ) %] >-<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | html %]&biblionumber=[% issueloo.biblionumber | html %]&bi=[% issueloo.biblioitemnumber | html %]">[% issueloo.title | html %]</a><br /> >+<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | uri %]&biblionumber=[% issueloo.biblionumber | uri %]&bi=[% issueloo.biblioitemnumber | uri %]">[% issueloo.title | html %]</a><br /> > Barcode: [% issueloo.barcode | html %]<br /> > Date due: [% issueloo.date_due | html %]<br /></p> > [% END %] >@@ -37,7 +37,7 @@ Date due: [% issueloo.date_due | html %]<br /></p> > <h4>Checked out</h4> > [% FOREACH issueloo IN issueloop %] > [% IF ( issueloo.red ) %][% ELSE %] >-<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | html %]&biblionumber=[% issueloo.biblionumber | html %]&bi=[% issueloo.biblioitemnumber | html %]">[% issueloo.title | html %]</a><br /> >+<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | uri %]&biblionumber=[% issueloo.biblionumber | uri %]&bi=[% issueloo.biblioitemnumber | uri %]">[% issueloo.title | html %]</a><br /> > Barcode: [% issueloo.barcode | html %]<br /> > Date due: [% issueloo.date_due | html %]<br /></p> > [% END %] >@@ -51,7 +51,7 @@ Date due: [% issueloo.date_due | html %]<br /></p> > <h4>Overdues</h4> > [% FOREACH issueloo IN issueloop %] > [% IF ( issueloo.red ) %] >-<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | html %]&biblionumber=[% issueloo.biblionumber | html %]&bi=[% issueloo.biblioitemnumber | html %]">[% issueloo.title | html %]</a><br /> >+<p><a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issueloo.itemnumber | uri %]&biblionumber=[% issueloo.biblionumber | uri %]&bi=[% issueloo.biblioitemnumber | uri %]">[% issueloo.title | html %]</a><br /> > Barcode: [% issueloo.barcode | html %]<br /> > Date due: [% issueloo.date_due | html %]</p> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index a88a98ee88..6e15e3c4d1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -92,7 +92,7 @@ > [% patron_message.message_date | $KohaDates %] > [% Branches.GetName( patron_message.branchcode ) | html %] > [% IF patron_message.manager_id %] >- ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron_message.manager_id | html %]">[% patron_message.get_column('manager_firstname') | html %] [% patron_message.get_column('manager_surname') | html %]</a> ) >+ ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron_message.manager_id | uri %]">[% patron_message.get_column('manager_firstname') | html %] [% patron_message.get_column('manager_surname') | html %]</a> ) > [% END %] > <i>"[% patron_message.message | html %]"</i> > </span> >@@ -173,19 +173,19 @@ > [% IF ( patron.phone ) %] > <li> > <span class="label">Primary phone: </span> >- <a href="tel:[% patron.phone | html %]">[% patron.phone | html %]</a> >+ <a href="tel:[% patron.phone | uri %]">[% patron.phone | html %]</a> > </li> > [% END %] > [% IF ( patron.phonepro ) %] > <li> > <span class="label">Secondary phone: </span> >- <a href="tel:[% patron.phonepro | html %]">[% patron.phonepro | html %]</a> >+ <a href="tel:[% patron.phonepro | uri %]">[% patron.phonepro | html %]</a> > </li> > [% END %] > [% IF ( patron.mobile ) %] > <li> > <span class="label">Other phone: </span> >- <a href="tel:[% patron.mobile | html %]">[% patron.mobile | html %]</a> >+ <a href="tel:[% patron.mobile | uri %]">[% patron.mobile | html %]</a> > </li> > [% END %] > [% IF ( patron.fax ) %] >@@ -232,7 +232,7 @@ > <ul> > [% FOREACH guarantee IN guarantees %] > [% IF logged_in_user.can_see_patron_infos( guarantee ) %] >- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | html %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></li> >+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | uri %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></li> > [% ELSE %] > <li>[% guarantee.firstname | html %] [% guarantee.surname | html %]</li> > [% END %] >@@ -243,7 +243,7 @@ > <li> > <span class="label">Guarantor:</span> > [% IF guarantor.borrowernumber AND logged_in_user.can_see_patron_infos( guarantor ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | html %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | uri %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a> > [% ELSE %] > [% guarantor.firstname | html %] [% guarantor.surname | html %] > [% END %] >@@ -382,7 +382,7 @@ > <ol> > <li> > <span class="label">SMS number:</span> >- <a href="sms:[% patron.smsalertnumber | html %]">[% patron.smsalertnumber | html %]</a> >+ <a href="sms:[% patron.smsalertnumber | uri %]">[% patron.smsalertnumber | html %]</a> > </li> > </ol> > </div> >@@ -476,7 +476,7 @@ > [% IF ( patron.password ) %] > ******* > [% ELSE %] >- <span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | html %]">Undefined</a></span> >+ <span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | uri %]">Undefined</a></span> > [% END %] > </li> > >@@ -537,7 +537,7 @@ > [% IF ( patron.B_phone ) %] > <li> > <span class="label">Phone: </span> >- <a href="tel:[% patron.B_phone | html %]">[% patron.B_phone |html %]</a> >+ <a href="tel:[% patron.B_phone | uri %]">[% patron.B_phone |html %]</a> > </li> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >index 62c830f48a..cb49492a94 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt >@@ -26,10 +26,10 @@ > <!-- The manual invoice and credit buttons --> > <div class="statictabs"> > <ul> >- <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Account</a></li> >- <li class="active"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]" >Pay fines</a></li> >- <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual invoice</a></li> >- <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual credit</a></li> >+ <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a></li> >+ <li class="active"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Pay fines</a></li> >+ <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a></li> >+ <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a></li> > </ul> > <div class="tabs-container"> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >index 2f8e1fb652..4ffb01716f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >@@ -16,7 +16,7 @@ > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › > <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › >- <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]">Pay fines for [% patron.firstname | html %] [% patron.surname | html %]</a> › >+ <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Pay fines for [% patron.firstname | html %] [% patron.surname | html %]</a> › > [% IF ( pay_individual ) %]Pay an individual fine > [% ELSIF ( writeoff_individual ) %]Write off an individual fine > [% ELSE %] >@@ -41,16 +41,16 @@ > <div class="statictabs"> > <ul> > <li> >- <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Account</a> >+ <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | uri %]">Account</a> > </li> > <li class="active"> >- <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]" >Pay fines</a> >+ <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Pay fines</a> > </li> > <li> >- <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual invoice</a> >+ <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual invoice</a> > </li> > <li> >- <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | html %]" >Create manual credit</a> >+ <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber | uri %]" >Create manual credit</a> > </li> > </ul> > <div class="tabs-container"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >index 709edb66e7..31ca5001df 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >@@ -50,7 +50,7 @@ > <p> > <strong> > [% IF ( CAN_user_catalogue ) %] >- <a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% s.suggestionid | html %]&op=show">[% s.title | html %]</a> >+ <a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% s.suggestionid | uri %]&op=show">[% s.title | html %]</a> > [% ELSE %] > [% s.title | html %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >index ab9a202d73..dcc722ca42 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt >@@ -72,7 +72,7 @@ > <td> > <span title="[% issue.issuestimestamp | html %]">[% issue.issuestimestamp | $KohaDates with_hours => 1 | html %]</span> > </td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issue.biblionumber | html %]">[% issue.title | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issue.biblionumber | uri %]">[% issue.title | html %]</a></td> > > <td>[% issue.author | html %]</td> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >index 37698b2973..fd607e6220 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt >@@ -53,7 +53,7 @@ > [% FOREACH routinglist IN routinglists %] > <tr> > <td> >- <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% routinglist.subscription.subscriptionid | html %]"> >+ <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% routinglist.subscription.subscriptionid | uri %]"> > [% routinglist.subscription.biblio.title | html %] > </a> > </td> >@@ -61,7 +61,7 @@ > [% routinglist.ranking | html %] > </td> > <td> >- <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% routinglist.subscription.subscriptionid | html %]"> >+ <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% routinglist.subscription.subscriptionid | uri %]"> > Edit routing list > </a> > <input type="hidden" name="biblionumber" value="[% routinglist.subscription.biblionumber | html %]" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >index 9c66a85627..430268d5aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt >@@ -53,7 +53,7 @@ > </td> > <td> > [% IF ( operation.biblionumber ) %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% operation.biblionumber | html %]" title="[% operation.bibliotitle | html %]">[% operation.barcode | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% operation.biblionumber | uri %]" title="[% operation.bibliotitle | html %]">[% operation.barcode | html %]</a> > [% ELSE %] > <span class="error">[% operation.barcode | html %]</span> > [% END %] >@@ -61,7 +61,7 @@ > <td> > [% IF ( operation.actionissue || operation.actionpayment) %] > [% IF ( operation.borrowernumber ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% operation.borrowernumber | html %]" title="[% operation.borrower | html %]">[% operation.cardnumber | html %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% operation.borrowernumber | uri %]" title="[% operation.borrower | html %]">[% operation.cardnumber | html %]</a> > [% ELSE %] > <span class="error">[% operation.cardnumber | html %]</span> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >index ca4b8f79a0..e1394c3824 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt >@@ -26,10 +26,10 @@ > </div> > [% END %] > [% IF ( message.ERROR_no_borrower_from_item ) %]<p>Warning: Unable to determine patron from item barcode ([% message.badbarcode | html %]). Cannot check in.</p>[% END %] >- [% IF ( message.issue ) %]<p>Checked out <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | html %]">[% message.title | html %]</a> ([% message.barcode | html %]) to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %] >- [% IF ( message.renew ) %]<p>Renewed <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | html %]">[% message.title | html %]</a> ([% message.barcode | html %]) for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %] >- [% IF ( message.return ) %]<p>Checked in <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | html %]">[% message.title | html %]</a> ([% message.barcode | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %] >- [% IF ( message.payment ) %]<p>Accepted payment ([% message.amount | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %] >+ [% IF ( message.issue ) %]<p>Checked out <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.title | html %]</a> ([% message.barcode | html %]) to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %] >+ [% IF ( message.renew ) %]<p>Renewed <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.title | html %]</a> ([% message.barcode | html %]) for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %] >+ [% IF ( message.return ) %]<p>Checked in <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.title | html %]</a> ([% message.barcode | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %] >+ [% IF ( message.payment ) %]<p>Accepted payment ([% message.amount | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | uri %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %] > [% END %] > [% ELSE %] > <h2>Upload offline circulation data</h2> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >index 006681b951..8e9ef4da87 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt >@@ -138,7 +138,7 @@ > <input type="hidden" id="borrowernumber_[% p.patron_list_patron_id | html %]" value="[% p.borrowernumber.id | html %]" /> > </td> > <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% p.borrowernumber.borrowernumber | html %]"> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% p.borrowernumber.borrowernumber | uri %]"> > [% p.borrowernumber.cardnumber | html %] > </a> > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >index 6e561ddeda..ca6c118542 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt >@@ -42,7 +42,7 @@ > [% FOREACH l IN lists %] > [% SET shared_by_other = l.owner.id != logged_in_user.id %] > <tr> >- <td><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | html %]">[% l.name | html %]</a></td> >+ <td><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]">[% l.name | html %]</a></td> > <td>[% l.patron_list_patrons_rs.count || 0 | html %]</td> > <td> > [% IF l.shared %] >@@ -59,9 +59,9 @@ > Actions <b class="caret"></b> > </a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="listactions[% l.patron_list_id | html %]"> >- <li><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | html %]"><i class="fa fa-user"></i> Add patrons</a></li> >+ <li><a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-user"></i> Add patrons</a></li> > [% UNLESS shared_by_other %] >- <li><a href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id | html %]"><i class="fa fa-pencil"></i> Edit list</a></li> >+ <li><a href="/cgi-bin/koha/patron_lists/add-modify.pl?patron_list_id=[% l.patron_list_id | uri %]"><i class="fa fa-pencil"></i> Edit list</a></li> > <li><a class="delete_patron" href="/cgi-bin/koha/patron_lists/delete.pl?patron_list_id=[% l.patron_list_id | html %]" data-list-name="[% l.name | html %]"><i class="fa fa-trash"></i> Delete list</a></li> > [% END %] > [% IF ( l.patron_list_patrons_rs.count ) %] >@@ -71,14 +71,14 @@ > </li> > [% IF CAN_user_tools_edit_patrons %] > <li> >- <a href="/cgi-bin/koha/tools/modborrowers.pl?patron_list_id=[% l.patron_list_id | html %]&op=show"> >+ <a href="/cgi-bin/koha/tools/modborrowers.pl?patron_list_id=[% l.patron_list_id | uri %]&op=show"> > <i class="fa fa-pencil"></i> Batch edit patrons > </a> > </li> > [% END %] > [% IF CAN_user_tools_delete_anonymize_patrons %] > <li> >- <a href="/cgi-bin/koha/tools/cleanborrowers.pl?step=2&patron_list_id=[% l.patron_list_id | html %]&checkbox=borrower"> >+ <a href="/cgi-bin/koha/tools/cleanborrowers.pl?step=2&patron_list_id=[% l.patron_list_id | uri %]&checkbox=borrower"> > <i class="fa fa-trash"></i> Batch delete patrons > </a> > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >index 305f3eb473..5823be2c39 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt >@@ -99,19 +99,19 @@ > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="pluginactions[% plugin.class | html %]"> > [% IF ( CAN_user_plugins_report ) %] > [% IF plugin.can('report') %] >- <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | html %]&method=report"><i class="fa fa-table"></i> Run report</a></li> >+ <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=report"><i class="fa fa-table"></i> Run report</a></li> > [% END %] > [% END %] > > [% IF ( CAN_user_plugins_tool ) %] > [% IF plugin.can('tool') %] >- <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | html %]&method=tool"><i class="fa fa-wrench"></i> Run tool</a></li> >+ <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=tool"><i class="fa fa-wrench"></i> Run tool</a></li> > [% END %] > [% END %] > > [% IF ( CAN_user_plugins_configure ) %] > [% IF plugin.can('configure') %] >- <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | html %]&method=configure"><i class="fa fa-cog"></i> Configure</a></li> >+ <li><a href="/cgi-bin/koha/plugins/run.pl?class=[% plugin.class | uri %]&method=configure"><i class="fa fa-cog"></i> Configure</a></li> > [% END %] > [% END %] > [% IF ( CAN_user_plugins_manage ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >index a33b13e7d7..a602ce6311 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt >@@ -76,7 +76,7 @@ > [% loopro.rowtitle | html %]</td> > [% FOREACH loopcel IN loopro.loopcell %] > [% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %] >- [% IF ( loopcel.reference ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopcel.reference | html %]">[% END %] >+ [% IF ( loopcel.reference ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopcel.reference | uri %]">[% END %] > [% IF ( loopcel.value ) %][% loopcel.value | html %][% END %] > [% IF ( loopcel.reference ) %]</a>[% END %] > </td> >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 09371f6dab..c38c9d8f9d 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 >@@ -191,7 +191,7 @@ > [% FOREACH loopresul IN loopresult %] > <tr> > <td>[% loopresul.mfirstname | html %] [% loopresul.msurname | html %]</td> >- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopresul.borrowernumber | html %]">[% loopresul.cardnumber | html %]</a></td> >+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopresul.borrowernumber | uri %]">[% loopresul.cardnumber | html %]</a></td> > <td>[% loopresul.bfirstname | html %] [% loopresul.bsurname | html %]</td> > <td>[% loopresul.branchname | html %]</td> > <td>[% loopresul.date | $KohaDates %]</td> >@@ -228,7 +228,7 @@ > </td> > <td>[% loopresul.note | html %]</td> > <td style="text-align:right;">[% loopresul.amount | $Price %]</td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | html %]">[% loopresul.title | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | uri %]">[% loopresul.title | html %]</a></td> > <td>[% loopresul.barcode | html %]</td> > <td>[% ItemTypes.GetDescription(loopresul.itype) | html %]</td> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt >index 9e2c533774..dcbdf5a376 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt >@@ -39,7 +39,7 @@ > <tr><th>Group</th><th>Call number range</th><th>Number of items displayed</th><th>Total items in group</th> > </tr> > [% FOREACH looptable IN mainloo.looptables %] >- <tr><td><a href="#table[% looptable.coltitle | html %]">[% looptable.coltitle | html %]</a></td> >+ <tr><td><a href="#table[% looptable.coltitle | uri %]">[% looptable.coltitle | html %]</a></td> > <td>[% IF ( looptable.looptable_count ) %] > [% looptable.looptable_first | html %] to [% looptable.looptable_last | html %] > [% END %] >@@ -71,7 +71,7 @@ > <td>[% loop.count | html %]</td> > <td>[% IF ( loopro.itemcallnumber ) %][% loopro.itemcallnumber | html %][% ELSE %]No call number[% END %]</td> > <td>[% IF ( loopro.barcode ) %][% loopro.barcode | html %][% ELSE %]No barcode[% END %]</td> >- <td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber | html %]">[% IF ( loopro.title ) %][% loopro.title | html %][% ELSE %]NO TITLE[% END %]</a> [% IF ( loopro.author ) %] by [% loopro.author | html %][% END %]</p> >+ <td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber | uri %]">[% IF ( loopro.title ) %][% loopro.title | html %][% ELSE %]NO TITLE[% END %]</a> [% IF ( loopro.author ) %] by [% loopro.author | html %][% END %]</p> > [% IF ( loopro.branch ) %]at [% Branches.GetName( loopro.branch ) | html %][% END %] > </td> > </tr> >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..6f68b53f18 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 >@@ -234,7 +234,7 @@ canned reports and writing custom SQL reports.</p> > </td> > <td class="report_json_url"> > [% IF (savedreport.public) %] >- <a href="[% OPACBaseURL | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | uri %]">[% OPACBaseURL | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %]</a> >+ <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/svc/report?id=[% savedreport.id | uri %]">[% OPACBaseURL | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %]</a> > [% ELSE %] > <a href="/cgi-bin/koha/svc/report?id=[% savedreport.id | uri %]">[% Koha.Preference('staffClientBaseURL') | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %]</a> > [% END %] >@@ -242,14 +242,14 @@ canned reports and writing custom SQL reports.</p> > <td>[% savedreport.cache_expiry | html %]</td> > <td> > [% FOR result IN savedreport.results %] >- <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=retrieve%20results&id=[% result.id | html %]">[% result.date_run | html %]</a> >+ <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=retrieve%20results&id=[% result.id | uri %]">[% result.date_run | html %]</a> > <br/> > [% END %] > </td> > <td> > [% IF savedreport.seems_obsolete %] > This report seems obsolete, it uses biblioitems.marcxml field. >- <a href="/cgi-bin/koha/svc/convert_report?report_id=[% savedreport.id | html %]" data-report_id="[% savedreport.id | html %]" class="update_sql btn btn-default btn-xs" title="Update SQL"><i class="fa fa-eye"></i> Update SQL</a> >+ <a href="/cgi-bin/koha/svc/convert_report?report_id=[% savedreport.id | uri %]" data-report_id="[% savedreport.id | html %]" class="update_sql btn btn-default btn-xs" title="Update SQL"><i class="fa fa-eye"></i> Update SQL</a> > [% END %] > </td> > <td> >@@ -262,12 +262,12 @@ canned reports and writing custom SQL reports.</p> > class="btn btn-default btn-xs dropdown-toggle" id="reportactions[% savedreport.id | html %]" role="button" data-toggle="dropdown" > href="#"><b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reportactions[% savedreport.id | html %]"> >- <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | html %]&phase=Show%20SQL"><i class="fa fa-search"></i> Show</a></li> >+ <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | uri %]&phase=Show%20SQL"><i class="fa fa-search"></i> Show</a></li> > [% IF ( CAN_user_reports_create_reports ) %] >- <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | html %]&phase=Edit%20SQL"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | uri %]&phase=Edit%20SQL"><i class="fa fa-pencil"></i> Edit</a></li> > <li><a title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&sql=[% savedreport.savedsql |uri %]&reportname=[% savedreport.report_name |uri %]&notes=[% savedreport.notes |uri %]"><i class="fa fa-copy"></i> Duplicate</a></li> > [% END %] >- <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id | html %]"><i class="fa fa-clock-o"></i> Schedule</a></li> >+ <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id | uri %]"><i class="fa fa-clock-o"></i> Schedule</a></li> > [% IF ( CAN_user_reports_delete_reports ) %] > <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id | html %]&phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a></li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >index 2ac53c94c7..bae06c0656 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -98,13 +98,13 @@ > </td> > [% END %] > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber | html %]" title="[% item.itemnotes | html %]">[% item.biblio.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber | uri %]" title="[% item.itemnotes | html %]">[% item.biblio.title | html %]</a> > </td> > <td>[% item.biblio.author | html %]</td> > <td>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) | html %] > <td><span title="[% item.itemlost_on | html %]">[% item.itemlost_on | $KohaDates %]</span></td> > <td> >- <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% item.biblionumber | html %]" title="[% item.itemnotes | html %]">[% item.barcode | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% item.biblionumber | uri %]" title="[% item.itemnotes | html %]">[% item.barcode | html %]</a> > </td> > <td>[% item.itemcallnumber | html %]</td> > <td><span title="[% item.datelastseen | html %]">[% item.datelastseen | $KohaDates %]</span></td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >index 00c653b472..9b9dacf90c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt >@@ -59,10 +59,10 @@ > [% ELSE %] <tr> > [% END %] > <td>[% ordersloo.budget_name | html %]</td> >- <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno | html %]"> [% ordersloo.basketno | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% ordersloo.basketno | uri %]"> [% ordersloo.basketno | html %]</a></td> > <td>[% ordersloo.basketname | html %]</td> > <td>[% ordersloo.authorisedbyname | html %]</td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | html %]"> [% ordersloo.title | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | uri %]"> [% ordersloo.title | html %]</a></td> > <td>[% ordersloo.currency | html %]</td> > <td>[% ordersloo.listprice | $Price %]</td> > <td>[% ordersloo.rrp | $Price %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >index b0273c12a8..bfbe36faea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt >@@ -52,7 +52,7 @@ > <td>[% loopro.rowtitle_display or "UNKNOWN VALUE" | html %]</td> > [% FOREACH loopcel IN loopro.loopcell %] > <td align="center"> >- [% IF ( loopcel.url_complement ) %]<a href="reserves_stats.pl?output=[% loopcel.output | html %]&[% loopcel.url_complement | html %]">[% loopcel.value | html %]</a>[% ELSE %][% loopcel.value | html %][% END %] >+ [% IF ( loopcel.url_complement ) %]<a href="reserves_stats.pl?output=[% loopcel.output | uri %]&[% loopcel.url_complement | uri %]">[% loopcel.value | html %]</a>[% ELSE %][% loopcel.value | html %][% END %] > </td> > [% END %] > <td align="center">[% loopro.totalrow | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >index af1ff09f2b..0c894d28f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt >@@ -41,8 +41,8 @@ > <tbody> > <tr> > [% FOREACH data IN datas %] >- <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% data.aqbooksellerid | html %]">[% data.name | html %]</a></td> >- <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid | html %]">[% data.title | html %]</a></td> >+ <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% data.aqbooksellerid | uri %]">[% data.name | html %]</a></td> >+ <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% data.subscriptionid | uri %]">[% data.title | html %]</a></td> > <td>[% data.subscriptionid | html %]</td> > <td>[% Branches.GetName( data.branchcode ) | html %]</td> > <td>[% data.callnumber | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 68ed8a69a9..c146346e78 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -96,29 +96,29 @@ > <h3>Cannot place hold</h3> > <ul> > [% IF ( exceeded_maxreserves ) %] >- <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% maxreserves | html %] total holds.</li> >+ <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% maxreserves | html %] total holds.</li> > [% ELSIF ( exceeded_holds_per_record ) %] >- <li><strong>Too many holds for this record: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li> >+ <li><strong>Too many holds for this record: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li> > [% ELSIF ( alreadypossession ) %] >- <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>is already in possession</strong> of one item.</li> >+ <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>is already in possession</strong> of one item.</li> > [% ELSIF ( alreadyreserved ) %] >- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>already has a hold</strong> on this item.</li> >+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>already has a hold</strong> on this item.</li> > [% ELSIF ( ageRestricted ) %] > <li><strong>Age restricted</strong></li> > [% ELSIF ( none_available ) %] > <li> <strong>No items are available</strong> to be placed on hold.</li> > [% ELSIF ( maxreserves ) %] >- <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> has too many holds.</li> >+ <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> has too many holds.</li> > [% END %] > </ul> > [% ELSE %] > <h3>Cannot place hold on some items</h3> > [% IF ( exceeded_maxreserves ) %] >- <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can place [% new_reserves_allowed | html %] of the requested [% new_reserves_count | html %] holds for a maximum of [% maxreserves | html %] total holds.</li> >+ <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can place [% new_reserves_allowed | html %] of the requested [% new_reserves_count | html %] holds for a maximum of [% maxreserves | html %] total holds.</li> > [% ELSIF ( exceeded_holds_per_record ) %] > [% FOREACH biblioloo IN biblioloop %] > [% IF (biblioloo.tooManyHoldsForThisRecord) %] >- <li><strong>Too many holds for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | html %]"> [% biblioloo.title | html %]</a>: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li> >+ <li><strong>Too many holds for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]"> [% biblioloo.title | html %]</a>: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li> > [% END %] > [% END %] > [% END %] >@@ -130,19 +130,19 @@ > [% IF ( expiry || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %] > <div class="dialog message"><ul> > [% IF ( expiry ) %] >- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Account has expired</strong></li> >+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Account has expired</strong></li> > [% END %] > > [% IF patron.is_debarred %] >- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]#reldebarments">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Patron has restrictions</strong></li> >+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]#reldebarments">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Patron has restrictions</strong></li> > [% END %] > > [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %] >- <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Patron has outstanding fines: [% amount_outstanding | format('%.2f') %]</strong></li> >+ <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: <strong>Patron has outstanding fines: [% amount_outstanding | format('%.2f') %]</strong></li> > [% END %] > > [% IF ( diffbranch ) %] >- <li> <strong>Pickup library is different. </strong>Patron: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a> Patron's home library: ([% Branches.GetName(patron.branchcode) | html %] / [% patron.branchcode | html %] )</li> >+ <li> <strong>Pickup library is different. </strong>Patron: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> Patron's home library: ([% Branches.GetName(patron.branchcode) | html %] / [% patron.branchcode | html %] )</li> > [% END %] > > </ul></div> >@@ -180,7 +180,7 @@ > > <ol> <li><span class="label">Patron:</span> > [% IF ( patron.borrowernumber ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a> > [% ELSE %] > Not defined yet > [% END %] >@@ -394,7 +394,7 @@ > Can't be cancelled when item is in transit > [% ELSE %] > [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %] >- [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedFor.borrowernumber | html %]">[% itemloo.ReservedFor.firstname | html %] [% itemloo.ReservedFor.surname | html %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] >+ [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedFor.borrowernumber | uri %]">[% itemloo.ReservedFor.firstname | html %] [% itemloo.ReservedFor.surname | html %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% Branches.GetName( itemloo.ExpectedAtLibrary ) | html %] > since > [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate | html %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber | html %]&CancelBorrowerNumber=[% itemloo.ReservedFor.borrowernumber | html %]&CancelItemnumber=[% itemloo.itemnumber | html %]" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);">Cancel hold</a> > >@@ -419,7 +419,7 @@ > </table> > [% IF ( bibitemloo.hiddencount ) %] > <form> >- <p class="hiddencount"><a href="request.pl?biblionumber=[% bibitemloo.biblionumber | html %]&borrowernumber=[% bibitemloo.borrowernumber | html %]&showallitems=1">Show all items ([% bibitemloo.hiddencount | html %] hidden)</a></p> >+ <p class="hiddencount"><a href="request.pl?biblionumber=[% bibitemloo.biblionumber | uri %]&borrowernumber=[% bibitemloo.borrowernumber | uri %]&showallitems=1">Show all items ([% bibitemloo.hiddencount | html %] hidden)</a></p> > </form> > [% END %] <!-- hiddencount --> > [% END %] <!-- bibitemloop --> >@@ -443,7 +443,7 @@ > [% END %] > <td> > <ul> >- <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | html %]">[% biblioloo.title | html %]</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]">[% biblioloo.title | html %]</a></li> > [% IF ( biblioloo.publicationyear ) %] > <li><span class="label">Publication year:</span> [% biblioloo.publicationyear | html %]</li> > [% END %] >@@ -470,7 +470,7 @@ > [% END %] > > [% IF ( biblioloo.alreadyres ) %] >- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>already has a hold</strong> on this item </li> >+ <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> <strong>already has a hold</strong> on this item </li> > [% END %] > [% IF ( biblioloo.none_avail ) %] > <li> <strong>No items are available</strong> to be placed on hold</li> >@@ -521,7 +521,7 @@ > [% IF ( biblioloo.reserveloop ) %] > [% IF ( multi_hold ) %] > <h3> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | html %]"> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]"> > [% biblioloo.title | html %] > </a> > </h3> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >index dff9da3aef..5bb432e015 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt >@@ -47,17 +47,17 @@ > <tbody>[% FOREACH review IN reviews %] > <tr> > <td> >- [% IF ( review.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber | html %]">[% review.patron.surname | html %], [% review.patron.firstname | html %]</a>[% ELSE %](deleted patron)[% END %] >+ [% IF ( review.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber | uri %]">[% review.patron.surname | html %], [% review.patron.firstname | html %]</a>[% ELSE %](deleted patron)[% END %] > </td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber | html %]">[% review.bibliotitle | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber | uri %]">[% review.bibliotitle | html %]</a> > </td> > <td> > [% review.review | html %] > </td> > <td> >- [% IF ( status ) %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=unapprove&reviewid=[% review.reviewid | html %]" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&reviewid=[% review.reviewid | html %]" class="btn btn-default btn-xs"><i class="fa fa-check"></i> Approve</a>[% END %] >- <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&reviewid=[% review.reviewid | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a> >+ [% IF ( status ) %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=unapprove&reviewid=[% review.reviewid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-remove"></i> Unapprove</a>[% ELSE %]<a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&reviewid=[% review.reviewid | html %]" class="btn btn-default btn-xs"><i class="fa fa-check"></i> Approve</a>[% END %] >+ <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&reviewid=[% review.reviewid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a> > </td> > </tr> > [% END %]</tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >index 3c786b17f7..bc11009ddc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt >@@ -106,7 +106,7 @@ > <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = collectionItemsLoo.biblionumber %][% collectionItemsLoo.title | html %]</a></td> > <td>[% collectionItemsLoo.itemcallnumber | html %]</td> > <td>[% collectionItemsLoo.barcode | html %]</td> >- <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | html %]&barcode=[% collectionItemsLoo.barcode | html %]&removeItem=1&action=addItem">Remove</a></td> >+ <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% colId | uri %]&barcode=[% collectionItemsLoo.barcode | uri %]&removeItem=1&action=addItem">Remove</a></td> > </tr> > [% END %] > </table> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt >index 614b7318f7..590df06aa8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt >@@ -19,7 +19,7 @@ > [%- IF ( action == "new" ) %] > Add a new collection > [% ELSE %] >- <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% editColId | html %]">Collection <i>[% editColTitle | html %]</i></a> › Edit >+ <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% editColId | uri %]">Collection <i>[% editColTitle | html %]</i></a> › Edit > [% END -%] > </div> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >index ee533f81fb..f33748d295 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt >@@ -36,7 +36,7 @@ > <tbody> > [% FOREACH collectionsLoo IN collectionsLoop %] > <tr> >- <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | html %]">[% collectionsLoo.colTitle | html %]</a></td> >+ <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | uri %]">[% collectionsLoo.colTitle | html %]</a></td> > <td>[% collectionsLoo.colDesc | html %]</td> > <td>[% Branches.GetName( collectionsLoo.colBranchcode ) | html %]</td> > <td> >@@ -44,9 +44,9 @@ > <a class="btn btn-default btn-xs" dropdown-toggle" id="collectionsactions[% collectionsLoo.colId | html %]" role="button" data-toggle="dropdown" href="#"> > Actions <b class="caret"></b></a> > <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="collectionsactions[% collectionsLoo.colId | html %]"> >- <li><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | html %]"><i class="fa fa-plus"></i> Add or remove items</a></li> >- <li><a href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% collectionsLoo.colId | html %]"><i class="fa fa-exchange"></i> Transfer</a></li> >- <li><a href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&colId=[% collectionsLoo.colId | html %]"><i class="fa fa-pencil"></i> Edit</a></li> >+ <li><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-plus"></i> Add or remove items</a></li> >+ <li><a href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-exchange"></i> Transfer</a></li> >+ <li><a href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-pencil"></i> Edit</a></li> > <li><a class="confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&colId=[% collectionsLoo.colId | html %]"><i class="fa fa-trash"></i> Delete</a></li> > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >index 4d6638c1e1..091451c2a7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt >@@ -110,8 +110,8 @@ > [% subscriptions_loo.expirationdate | $KohaDates %] > </td> > <td class="actions"> >- <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=[% subscriptions_loo.subscriptionid | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscriptions_loo.subscriptionid | html %]" data-subscriptionid="[% subscriptions_loo.subscriptionid | html %]" class="btn btn-default btn-xs renew_subscription"><i class="fa fa-refresh"></i> Renew</a> >+ <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=[% subscriptions_loo.subscriptionid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscriptions_loo.subscriptionid | uri %]" data-subscriptionid="[% subscriptions_loo.subscriptionid | html %]" class="btn btn-default btn-xs renew_subscription"><i class="fa fa-refresh"></i> Renew</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >index a47a61830f..f79b1596a5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt >@@ -129,7 +129,7 @@ > <span class="branch-[% missingissue.branchcode | html %]">[% Branches.GetName( missingissue.branchcode ) | html %]</span> > </td> > <td> >- <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% missingissue.subscriptionid | html %]">[% missingissue.title | html %]</a> >+ <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% missingissue.subscriptionid | uri %]">[% missingissue.title | html %]</a> > </td> > <td>[% missingissue.issn | html %]</td> > <td>[% missingissue.serialseq | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >index 4a6f4749c1..b93120fc61 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt >@@ -72,7 +72,7 @@ > <p style="margin-left:10em;"> > <a href="#" id="add_recipients"><i class="fa fa-plus"></i> Add recipients</a> > [% IF memberloop %] >- <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | html %]&op=delete"><i class="fa fa-trash"></i> Delete all</a> >+ <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid | uri %]&op=delete"><i class="fa fa-trash"></i> Delete all</a> > [% END %] > </p> > </li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 1af50fe9de..2244f70536 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -49,7 +49,7 @@ > </tr> > [% FOREACH subscription IN subscriptions %] > <tr> >- <td><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]"># [% subscription.subscriptionid | html %]</a> </td> >+ <td><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]"># [% subscription.subscriptionid | html %]</a> </td> > <td>[% subscription.frequency.description | html %]</td> > <td>[% subscription.numberpattern.label | html %]</td> > <td>[% IF subscription.branchcode %][% Branches.GetName( subscription.branchcode ) | html %][% END %]</td> >@@ -87,7 +87,7 @@ > [% END %] > [% IF ( subscr ) %] > [% IF ( subscriptioncount > 1 ) %] >-<tr ><td colspan="8"> <a href="serials-collection.pl?biblionumber=[% biblionumber | html %]">See any subscription attached to this biblio</a></td> >+<tr ><td colspan="8"> <a href="serials-collection.pl?biblionumber=[% biblionumber | uri %]">See any subscription attached to this biblio</a></td> > </tr> > [% END %] > [% END %] >@@ -103,7 +103,7 @@ > [% IF year.year == 'manage' %] > <li><a href="#subscription-year-manage">Manage</a></li> > [% ELSE %] >- <li><a href="#subscription-year-[% year.year | html %]">[% year.year | html %]</a></li> >+ <li><a href="#subscription-year-[% year.year | uri %]">[% year.year | html %]</a></li> > [% END %] > [% END %] > [% END %] >@@ -173,7 +173,7 @@ > </td> > [% END %] > [% IF ( subscriptions.size > 1 ) %] >- <td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid | html %]">[% serial.subscriptionid | html %]</a></td> >+ <td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid | uri %]">[% serial.subscriptionid | html %]</a></td> > [% END %] > <td> > <span title="[% serial.publisheddate | html %]"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >index 2ce4afabba..b6c718366d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt >@@ -98,7 +98,7 @@ > [% IF ( subscription.issn ) %][% subscription.issn | html %] > [% END %] > </td> >- <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]" class="button" title="subscription detail">[% subscription.title | html %]</a> >+ <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]" class="button" title="subscription detail">[% subscription.title | html %]</a> > </td> > <td>[% IF ( subscription.publicnotes ) %][% subscription.publicnotes | html %][% END %] > [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes | html %])[% END %] >@@ -141,13 +141,13 @@ > [% IF ( routing && CAN_user_serials_routing ) %] > [% UNLESS ( subscription.cannotedit ) %] > <li> >- <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid | html %]&op=reopen&routing=[% subscription.routing | html %]&searched=1&title_filter=[% title_filter | uri %]&ISSN_filter=[% ISSN_filter | uri %]&EAN_filter=[% EAN_filter | uri %]&published_filter=[% publisher_filter | uri %]&bookseller_filter=[% bookseller_filter | uri %]&branch_filter=[% branch_filter | uri %]" id="reopensub"> <i class="fa fa-repeat"></i> Reopen</a> >+ <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid | uri %]&op=reopen&routing=[% subscription.routing | uri %]&searched=1&title_filter=[% title_filter | uri %]&ISSN_filter=[% ISSN_filter | uri %]&EAN_filter=[% EAN_filter | uri %]&published_filter=[% publisher_filter | uri %]&bookseller_filter=[% bookseller_filter | uri %]&branch_filter=[% branch_filter | uri %]" id="reopensub"> <i class="fa fa-repeat"></i> Reopen</a> > </li> > [% END %] > [% END # IF ( routing && CAN_user_serials_routing ) %] > > <li> >- <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | html %]"><i class="fa fa-list-alt"></i> Issue history</a> >+ <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa fa-list-alt"></i> Issue history</a> > </li> > > </ul> >@@ -170,18 +170,18 @@ > [% ELSE %] > [% IF ( subscription.routingedit ) %] > <li> >- <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid | html %]"><i class="fa fa-pencil"></i> Edit routing list ([% subscription.routingedit | html %])</a> >+ <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa fa-pencil"></i> Edit routing list ([% subscription.routingedit | html %])</a> > </li> > [% ELSE %] > <li> >- <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid | html %]&op=new"> <i class="fa fa-plus"></i> New routing list</a> >+ <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid | uri %]&op=new"> <i class="fa fa-plus"></i> New routing list</a> > </li> > [% END %] > [% END %] > [% END # IF ( routing && CAN_user_serials_routing ) %] > > <li> >- <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | html %]"><i class="fa fa-list-alt"></i> Issue history</a> >+ <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa fa-list-alt"></i> Issue history</a> > </li> > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt >index 2880d77f6b..aa81f216f3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt >@@ -47,8 +47,8 @@ > [% FOREACH subscription IN subscriptions %] > <tr> > <td>[% subscription.biblio.biblioitem.issn | html %]</td> >- <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | html %]">[% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %])</a></td> >- <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% subscription.vendor.id | html %]">[% subscription.vendor.name | html %]</a></td> >+ <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]">[% subscription.biblio.title | html %] (#[% subscription.subscriptionid | html %])</a></td> >+ <td><a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% subscription.vendor.id | uri %]">[% subscription.vendor.name | html %]</a></td> > <td>[% AuthorisedValues.GetByCode('LOC', subscription.location) | html %]</td> > <td>[% Branches.GetName(subscription.branchcode) | html %]</td> > <td>[% ItemTypes.GetDescription( subscription.itemtype ) | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >index a2cb7d48fd..ab8ac13f3a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -74,8 +74,8 @@ > <ol> > <li><span class="label">Subscription ID: </span>[% subscriptionid | html %]</li> > <li><span class="label">Librarian identity:</span> [% librarian | html %]</li> >- <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid | html %]">[% aqbooksellername | html %]</a></li> >- <li><span class="label">Biblio:</span> <a href="/cgi-bin/koha/catalogue/[% default_bib_view | html %].pl?biblionumber=[% bibnum | html %]">[% bibliotitle | html %]</a> <i>([% bibnum | html %])</i></li> >+ <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid | uri %]">[% aqbooksellername | html %]</a></li> >+ <li><span class="label">Biblio:</span> <a href="/cgi-bin/koha/catalogue/[% default_bib_view | uri %].pl?biblionumber=[% bibnum | uri %]">[% bibliotitle | html %]</a> <i>([% bibnum | html %])</i></li> > [% IF ( OPACBaseURL ) %] > <li> > <span class="label">OPAC view:</span> >@@ -110,7 +110,7 @@ > [% IF ( letter ) %] > <li> > <span class="label">Patron notification:</span> [% letter | html %] >- (<a href="/cgi-bin/koha/serials/viewalerts.pl?subscriptionid=[% subscriptionid | html %]">subscribers</a>) >+ (<a href="/cgi-bin/koha/serials/viewalerts.pl?subscriptionid=[% subscriptionid | uri %]">subscribers</a>) > </li> > [% END %] > [% IF ( hasRouting ) %]<li><span class="label">Routing:</span> yes</li>[% END %] >@@ -156,7 +156,7 @@ > <li> > <span class="label">Manual history: </span> > [% IF ( manualhistory ) %] >- Enabled <a href="/cgi-bin/koha/serials/subscription-history.pl?subscriptionid=[% subscriptionid | html %]">Edit history</a> >+ Enabled <a href="/cgi-bin/koha/serials/subscription-history.pl?subscriptionid=[% subscriptionid | uri %]">Edit history</a> > [% ELSE %] > Disabled > [% END %] >@@ -371,7 +371,7 @@ > <td> > [% IF order.invoice %] > [% IF CAN_user_acquisition %] >- <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | html %]" title="Invoice detail page"> >+ <a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]" title="Invoice detail page"> > [% order.invoice.invoicenumber | html %]</a> > [% ELSE %] > [% order.invoice.invoicenumber | html %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >index ee6230d2ce..c3f94188ec 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt >@@ -107,7 +107,7 @@ > <ul id="blocking_subs" style="display:none"> > [% FOREACH sub IN subscriptions %] > <li style="list-style-type:none"> >- <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | html %]">[% sub.title | html %]</a> >+ <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | uri %]">[% sub.title | html %]</a> > </li> > [% END %] > </ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >index a089dac02b..ccd21bc567 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt >@@ -240,7 +240,7 @@ > <ul id="blocking_subs" style="display:none"> > [% FOREACH sub IN subscriptions %] > <li style="list-style-type:none"> >- <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | html %]">[% sub.title | html %]</a> >+ <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% sub.subscriptionid | uri %]">[% sub.title | html %]</a> > </li> > [% END %] > </ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt >index 2943695159..cc5b776f40 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt >@@ -16,7 +16,7 @@ > <h1>Alert subscribers for <i>[% bibliotitle | html %]</i></h1> > > <p> >- <span class="label">Subscription:</span> <a href="subscription-detail.pl?subscriptionid=[% subscriptionid | html %]">[% bibliotitle | html %] #[% subscriptionid | html %]</a> >+ <span class="label">Subscription:</span> <a href="subscription-detail.pl?subscriptionid=[% subscriptionid | uri %]">[% bibliotitle | html %] #[% subscriptionid | html %]</a> > </p> > > [% IF subscribers.count %] >@@ -27,7 +27,7 @@ > [% FOREACH subscriber IN subscribers %] > <tr> > <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% subscriber.borrowernumber | html %]">[% INCLUDE 'patron-title.inc' patron=subscriber %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% subscriber.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' patron=subscriber %]</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 03cde0a100..869a742903 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -162,7 +162,7 @@ > <td>[% suggesteddate | $KohaDates %]</td> > <td> > [% IF ( suggestedby_borrowernumber ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | html %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | uri %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> > [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %]) > [% END %] > </td> >@@ -172,7 +172,7 @@ > <td>[% manageddate | $KohaDates %]</td> > <td> > [% IF ( managedby_borrowernumber ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber | html %]">[% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber | uri %]">[% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> > [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %]) > [% END %] > </td> >@@ -182,7 +182,7 @@ > <td>[% accepteddate | $KohaDates %]</td> > <td> > [% IF ( acceptedby_borrowernumber ) %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | html %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | uri %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> > [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %]) > [% END %] > </td> >@@ -347,18 +347,18 @@ > <tr> > <th><label for="suggesteddate">Created by:</label> </th> > <td><input type="text" id="suggesteddate" name="suggesteddate" class="datepicker" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]</td> >- <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | html %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])[% END %] >+ <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | uri %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])[% END %] > </td> > </tr> > <tr> > <th><label for="managedon">Managed by:</label> </th> > <td><input type="text" id="managedon" name="manageddate" class="datepicker" size="10" maxlength="10" value="[% manageddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td> >- <td><input type="hidden" id="managedby" name="managedby" value="[% managedby | html %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber | html %]">[% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])[% END %]</td> >+ <td><input type="hidden" id="managedby" name="managedby" value="[% managedby | html %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber | uri %]">[% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %])[% END %]</td> > </tr> > <tr> > <th><label for="accepteddate">Accepted on:</label> </th> > <td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td> >- <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby | html %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | html %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])[% END %]</td> >+ <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby | html %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | uri %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])[% END %]</td> > </tr> > </tbody> > </table></li></ol> >@@ -434,7 +434,7 @@ > <ul class="ui-tabs-nav"> > [% FOREACH suggestion IN suggestions %] > <li> >- <a href="#[% suggestion.suggestiontype | html %]"> >+ <a href="#[% suggestion.suggestiontype | uri %]"> > [% IF ( suggestion.suggestiontypelabel ) %] > [% IF (suggestion.suggestiontypelabel == "Pending") %]Pending > [% ELSIF (suggestion.suggestiontypelabel == "Accepted") %]Accepted >@@ -483,7 +483,7 @@ > <input type="checkbox" name="edit_field" value="[% suggestions_loo.suggestionid | html %]" /> > </td> > <td> >- <a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | html %]&op=show" title="suggestion" > >+ <a href="suggestion.pl?suggestionid=[% suggestions_loo.suggestionid | uri %]&op=show" title="suggestion" > > [% suggestions_loo.title | html %][% IF ( suggestions_loo.author ) %], by [% suggestions_loo.author | html %][% END %]</a> > <br /> > [% IF ( suggestions_loo.copyrightdate ) %]© [% suggestions_loo.copyrightdate | html %] [% END %] >@@ -491,11 +491,11 @@ > [% IF ( suggestions_loo.isbn ) %]; ISBN:<i>[% suggestions_loo.isbn | html %]</i> [% END %][% IF ( suggestions_loo.publishercode ) %]; Published by [% suggestions_loo.publishercode | html %] [% END %][% IF ( suggestions_loo.publicationyear ) %] in <i>[% suggestions_loo.publicationyear | html %]</i> [% END %][% IF ( suggestions_loo.place ) %] in <i>[% suggestions_loo.place | html %]</i> [% END %][% IF ( suggestions_loo.collectiontitle ) %]; [% suggestions_loo.collectiontitle | html %] [% END %][% IF ( suggestions_loo.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestions_loo.itemtype, 0 ) | html %] [% END %]<br />[% IF ( suggestions_loo.note ) %]<span class="note">[% suggestions_loo.note | html %]</span>[% END %] > </td> > <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | html %]">[% suggestions_loo.surnamesuggestedby | html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby | html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby | html %])[% END %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | uri %]">[% suggestions_loo.surnamesuggestedby | html %][% IF ( suggestions_loo.firstnamesuggestedby ) %], [% suggestions_loo.firstnamesuggestedby | html %][% END %] [% IF (suggestions_loo.cardnumbersuggestedby ) %]([% suggestions_loo.cardnumbersuggestedby | html %])[% END %]</a> > [% IF ( suggestions_loo.suggesteddate ) %] - [% suggestions_loo.suggesteddate | $KohaDates %][% END %] > </td> > <td> >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | html %]">[% suggestions_loo.surnamemanagedby | html %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby | html %][% END %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestions_loo.suggestedby | uri %]">[% suggestions_loo.surnamemanagedby | html %][% IF ( suggestions_loo.firstnamemanagedby ) %], [% suggestions_loo.firstnamemanagedby | html %][% END %]</a> > [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate | $KohaDates %][% END %] > </td> > <td> >@@ -578,7 +578,7 @@ > > <span id="other_reason[% suggestion.suggestiontype | html %]"> > <input type="text" size="31" id="select-other_reason[% suggestion.suggestiontype | html %]" name="other_reason[% suggestion.suggestiontype | html %]" placeholder="please note your reason here..." /> >- <a href="#back[% suggestion.suggestiontype | html %]">Cancel</a> >+ <a href="#back[% suggestion.suggestiontype | uri %]">Cancel</a> > </span> > > <strong style="padding: 0 1em;">OR:</strong> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >index 94f9afefe9..ef70cfd1de 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt >@@ -41,7 +41,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > [% IF ( title.notes ) %] > <p>[% title.notes | html %]</p>[% END %] > [% IF ( title.TagLoop ) %]<p style="font-size:90%"><strong>Tagged with:</strong> [% FOREACH TagLoo IN title.TagLoop %] >- <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term | html %]">[% TagLoo.term | html %]</a> <span class="weight">([% TagLoo.weight_total | html %])</span>[% IF ( loop.last ) %][% ELSE %], [% END %] >+ <a href="/cgi-bin/koha/tags/list.pl?tag=[% TagLoo.term | uri %]">[% TagLoo.term | html %]</a> <span class="weight">([% TagLoo.weight_total | html %])</span>[% IF ( loop.last ) %][% ELSE %], [% END %] > [% END %]</p> > [% END %] > </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >index 8279015dbd..d9f0fed548 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt >@@ -119,7 +119,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } > [% END %] > </span> > </td> >- <td>[% IF ( tagloo.approved_by_name ) %]<a href="/cgi-bin/koha/tags/review.pl?approved_by=[% tagloo.approved_by | html %]&approved=all">[% tagloo.approved_by_name | html %]</a>[% ELSE %] [% END %] >+ <td>[% IF ( tagloo.approved_by_name ) %]<a href="/cgi-bin/koha/tags/review.pl?approved_by=[% tagloo.approved_by | uri %]&approved=all">[% tagloo.approved_by_name | html %]</a>[% ELSE %] [% END %] > </td> > [% ELSE %] > <td class="actions"><span class="ajax_buttons" style="visibility:hidden"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >index 3fb084f721..0579328b3b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt >@@ -105,7 +105,7 @@ > </thead> > <tbody> > [% FOREACH item_loo IN item_loop %] <tr> [% IF ( show ) %][% IF ( item_loo.nomod ) %] <td class="error">Cannot edit</td>[% ELSE %]<td><input type="checkbox" name="itemnumber" value="[% item_loo.itemnumber | html %]" id="row[% item_loo.itemnumber | html %]" checked="checked" /></td>[% END %][% END %] >- <td><label for="row[% item_loo.itemnumber | html %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber | html %]">[% item_loo.title | html %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author | html %][% END %]</label></td> >+ <td><label for="row[% item_loo.itemnumber | html %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber | uri %]">[% item_loo.title | html %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author | html %][% END %]</label></td> > [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field | html %]</td> > [% END %] </tr> > [% END %] >@@ -118,7 +118,7 @@ > <ul> > [% FOREACH simple_items_displa IN simple_items_display %] > <li> >- <a href="[% simple_items_displa.itemnumber | html %]">[% simple_items_displa.barcode | html %]</a> >+ <a href="[% simple_items_displa.itemnumber | uri %]">[% simple_items_displa.barcode | html %]</a> > </li> > [% END %] > </ul> >@@ -162,9 +162,9 @@ > <p>[% deleted_items | html %] item(s) deleted.</p> > [% IF delete_records %] <p>[% deleted_records | html %] record(s) deleted.</p> [% END %] > [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]">Return to the record</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a> > [% ELSIF src %] >- <a href="[% src | html %]">Return to where you were</a> >+ <a href="[% src | uri %]">Return to where you were</a> > [% ELSE %] > <a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a> > [% END %] >@@ -185,7 +185,7 @@ > [% FOREACH not_deleted_loo IN not_deleted_loop %] > <tr> > <td>[% not_deleted_loo.itemnumber | html %]</td> >- <td>[% IF ( CAN_user_editcatalogue_edit_items ) %]<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% not_deleted_loo.biblionumber | html %]&itemnumber=[% not_deleted_loo.itemnumber | html %]">[% not_deleted_loo.barcode | html %]</a>[% ELSE %][% not_deleted_loo.barcode | html %][% END %]</td> >+ <td>[% IF ( CAN_user_editcatalogue_edit_items ) %]<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% not_deleted_loo.biblionumber | uri %]&itemnumber=[% not_deleted_loo.itemnumber | uri %]">[% not_deleted_loo.barcode | html %]</a>[% ELSE %][% not_deleted_loo.barcode | html %][% END %]</td> > <td>[% IF ( not_deleted_loo.book_on_loan ) %]Item is checked out[% ELSIF ( not_deleted_loo.book_reserved ) %]Item has a waiting hold[% END %]</td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >index ed8584f8c4..3c09313370 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt >@@ -77,9 +77,9 @@ $(document).ready(function(){ > [% END %] > <fieldset class="action"> > [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]">Return to the record</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a> > [% ELSIF src %] >- <a href="[% src | html %]">Return to where you were</a> >+ <a href="[% src | uri %]">Return to where you were</a> > [% ELSE %] > <a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a> > [% END %] >@@ -175,7 +175,7 @@ $(document).ready(function(){ > [% ELSE %] > <td> </td> > [% END %] >- <td><label for="row[% item_loo.itemnumber | html %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber | html %]">[% item_loo.title | html %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author | html %][% END %]</label></td> >+ <td><label for="row[% item_loo.itemnumber | html %]"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item_loo.biblionumber | uri %]">[% item_loo.title | html %]</a>[% IF ( item_loo.author ) %], by [% item_loo.author | html %][% END %]</label></td> > [% FOREACH item_valu IN item_loo.item_value %] <td>[% item_valu.field | html %]</td> > [% END %] </tr> > [% END %] >@@ -189,7 +189,7 @@ $(document).ready(function(){ > <ul> > [% FOREACH simple_items_displa IN simple_items_display %] > <li> >- [% IF ( CAN_user_editcatalogue_edit_items ) %]<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% simple_items_displa.biblionumber | html %]&itemnumber=[% simple_items_displa.itemnumber | html %]">[% simple_items_displa.barcode | html %]</a>[% ELSE %][% simple_items_displa.barcode | html %][% END %] >+ [% IF ( CAN_user_editcatalogue_edit_items ) %]<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=[% simple_items_displa.biblionumber | uri %]&itemnumber=[% simple_items_displa.itemnumber | uri %]">[% simple_items_displa.barcode | html %]</a>[% ELSE %][% simple_items_displa.barcode | html %][% END %] > </li> > [% END %] > </ul> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >index a3140d2611..d819675398 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt >@@ -112,9 +112,9 @@ > <td><input type="checkbox" name="record_id" id="record_id_[% biblio.biblionumber | html %]" value="[% biblio.biblionumber | html %]" data-items="[% biblio.itemnumbers.size | html %]" data-issues="[% biblio.issues_count | html %]" data-reserves="[% biblio.holds_count | html %]" /></td> > <td><label for="record_id_[% biblio.biblionumber | html %]">[% biblio.biblionumber | html %]</label></td> > <td>[% INCLUDE 'biblio-default-view.inc' biblionumber=biblio.biblionumber %][% biblio.title | html %][% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle %] [% subtitle.subfield | html %][% END %][% END %]</a></td> >- <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | html %]">[% biblio.itemnumbers.size | html %]</a></td> >- <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber | html %]">[% biblio.holds_count | html %]</a></td> >- <td><a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio.biblionumber | html %]">[% biblio.issues_count | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.itemnumbers.size | html %]</a></td> >+ <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.holds_count | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.issues_count | html %]</a></td> > </tr> > [% END %] > </tbody> >@@ -140,9 +140,9 @@ > [% FOR authority IN records %] > <tr> > <td><input type="checkbox" name="record_id" value="[% authority.authid | html %]" data-usage="[% authority.count_usage | html %]" /></td> >- <td><a href="/cgi-bin/koha/authorities/detail.pl?authid=[% authority.authid | html %]">[% authority.authid | html %]</a></td> >+ <td><a href="/cgi-bin/koha/authorities/detail.pl?authid=[% authority.authid | uri %]">[% authority.authid | html %]</a></td> > <td>[% PROCESS authresult summary=authority.summary %]</td> >- <td><a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&op=do_search&idx=an,phr&q=[% authority.authid | html %]">[% authority.count_usage | html %] record(s)</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/search.pl?type=intranet&op=do_search&idx=an,phr&q=[% authority.authid | uri %]">[% authority.count_usage | html %] record(s)</a></td> > </tr> > [% END %] > </tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >index fb0355598a..0b975c2766 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt >@@ -42,13 +42,13 @@ > [% ELSIF message.code == 'authority_not_exists' %] > Authority record [% message.authid | html %] does not exist in the database. > [% ELSIF message.code == 'biblio_not_modified' %] >- Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | html %]">[% message.biblionumber | html %]</a> has not been modified. An error occurred on modifying it. >+ Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.biblionumber | html %]</a> has not been modified. An error occurred on modifying it. > [% ELSIF message.code == 'authority_not_modified' %] >- Authority record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid | html %]">[% message.authid | html %]</a> has not been modified. An error occurred on modifying it. >+ Authority record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid | uri %]">[% message.authid | html %]</a> has not been modified. An error occurred on modifying it. > [% ELSIF message.code == 'biblio_modified' %] >- Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | html %]">[% message.biblionumber | html %]</a> has successfully been modified. >+ Bibliographic record <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.biblionumber | html %]</a> has successfully been modified. > [% ELSIF message.code == 'authority_modified' %] >- Bibliographic record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid | html %]">[% message.authid | html %]</a> has successfully been modified. >+ Bibliographic record <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% message.authid | uri %]">[% message.authid | html %]</a> has successfully been modified. > [% END %] > [% IF message.error %] > (The error was: [% message.error | html %]. See the Koha logfile for more information). >@@ -152,9 +152,9 @@ > <tr> > <td><input type="checkbox" name="record_id" value="[% biblio.biblionumber | html %]" /></td> > <td>[% biblio.biblionumber | html %]</td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | html %]">[% biblio.title | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></td> > <td class="actions"> >- <a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber | html %]&mmtid=[% mmtid | html %]" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber | html %]" data-mmtid="[% mmtid | html %]" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a> >+ <a href="/cgi-bin/koha/svc/records/preview?record_type=biblio&record_id=[% biblio.biblionumber | uri %]&mmtid=[% mmtid | uri %]" class="previewMARC btn btn-default btn-xs" data-record_type="biblio" data-record_id="[% biblio.biblionumber | html %]" data-mmtid="[% mmtid | html %]" title="Preview MARC"><i class="fa fa-eye"></i> Show MARC</a> > </td> > </tr> > [% END %] >@@ -179,9 +179,9 @@ > [% FOR authority IN records %] > <tr> > <td><input type="checkbox" name="record_id" value="[% authority.authid | html %]" data-usage="[% authority.count_usage | html %]" /></td> >- <td><a href="/cgi-bin/koha/authorities/detail.pl?authid=[% authority.authid | html %]">[% authority.authid | html %]</a></td> >+ <td><a href="/cgi-bin/koha/authorities/detail.pl?authid=[% authority.authid | uri %]">[% authority.authid | html %]</a></td> > <td>[% PROCESS authresult summary=authority.summary %]</td> >- <td class="actions"><a href="/cgi-bin/koha/svc/records/preview?record_type=authority&record_id=[% authority.authid | html %]&mmtid=[% mmtid | html %]" data-record_type="authority" data-record_id="[% authority.authid | html %]" data-mmtid="[% mmtid | html %]" class="previewMARC btn btn-default btn-xs"><i class='fa fa-eye'></i> Show MARC</a> >+ <td class="actions"><a href="/cgi-bin/koha/svc/records/preview?record_type=authority&record_id=[% authority.authid | uri %]&mmtid=[% mmtid | uri %]" data-record_type="authority" data-record_id="[% authority.authid | html %]" data-mmtid="[% mmtid | html %]" class="previewMARC btn btn-default btn-xs"><i class='fa fa-eye'></i> Show MARC</a> > </tr> > [% END %] > </tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >index f10083a4a8..89ac0b6bf7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt >@@ -268,8 +268,8 @@ > <td>[% PROCESS type_description type_code = csv_profile.type %]</td> > <td>[% PROCESS used_for_description used_for_code = csv_profile.used_for %]</td> > <td class="actions"> >- <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form&export_format_id=[% csv_profile.export_format_id | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=delete_confirm&export_format_id=[% csv_profile.export_format_id | html %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=add_form&export_format_id=[% csv_profile.export_format_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/tools/csv-profiles.pl?op=delete_confirm&export_format_id=[% csv_profile.export_format_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >index 651634f72c..9e57bd5c24 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -249,7 +249,7 @@ td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl > <tbody> > [% FOREACH EXCEPTION_HOLIDAYS_LOO IN EXCEPTION_HOLIDAYS_LOOP %] > <tr> >- <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch | html %]&calendardate=[% EXCEPTION_HOLIDAYS_LOO.DATE | html %]"><span title="[% EXCEPTION_HOLIDAYS_LOO.DATE_SORT | html %]">[% EXCEPTION_HOLIDAYS_LOO.DATE | html %]</span></a></td> >+ <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch | uri %]&calendardate=[% EXCEPTION_HOLIDAYS_LOO.DATE | uri %]"><span title="[% EXCEPTION_HOLIDAYS_LOO.DATE_SORT | html %]">[% EXCEPTION_HOLIDAYS_LOO.DATE | html %]</span></a></td> > <td>[% EXCEPTION_HOLIDAYS_LOO.TITLE | html %]</td> > <td>[% EXCEPTION_HOLIDAYS_LOO.DESCRIPTION | html %]</td> > </tr> >@@ -320,7 +320,7 @@ td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl > <tbody> > [% FOREACH HOLIDAYS_LOO IN HOLIDAYS_LOOP %] > <tr> >- <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch | html %]&calendardate=[% HOLIDAYS_LOO.DATE | html %]"><span title="[% HOLIDAYS_LOO.DATE_SORT | html %]">[% HOLIDAYS_LOO.DATE | html %]</span></a></td> >+ <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch | uri %]&calendardate=[% HOLIDAYS_LOO.DATE | uri %]"><span title="[% HOLIDAYS_LOO.DATE_SORT | html %]">[% HOLIDAYS_LOO.DATE | html %]</span></a></td> > <td>[% HOLIDAYS_LOO.TITLE | html %]</td> > <td>[% HOLIDAYS_LOO.DESCRIPTION.replace('\\\r\\\n', '<br />') | html %]</td> > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >index 104606ed4b..6ec95799e5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt >@@ -193,7 +193,7 @@ > <span class="shelvingloc">[% result.location | html %]</span> > </td> > <td> >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% result.biblionumber | html %]" class="openWin">[% result.title | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% result.biblionumber | uri %]" class="openWin">[% result.title | html %]</a> > [% IF ( result.author ) %] > by <span class="author">[% result.author | html %]</span> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >index 8ca8a11972..d73f2c7c0a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt >@@ -203,8 +203,8 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div> > [% opac_new.content | $raw %] > </td> > <td class="actions"> >- <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=[% opac_new.idnew | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&ids=[% opac_new.idnew | html %]" class="delete_news btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> >+ <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=[% opac_new.idnew | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >+ <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&ids=[% opac_new.idnew | uri %]" class="delete_news btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a> > </td> > </tr> > [% END %]</tbody> >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 36df8f681f..cc2457171f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt >@@ -305,9 +305,9 @@ > [% FOR language IN languages %] > [% FOR sublanguage IN language.sublanguages_loop %] > [% IF language.plural %] >- <li><a href="#lang_[% sublanguage.rfc4646_subtag | html %]">[% sublanguage.native_description | html %] [% sublanguage.region_description | html %] ([% sublanguage.rfc4646_subtag | html %])</a></li> >+ <li><a href="#lang_[% sublanguage.rfc4646_subtag | uri %]">[% sublanguage.native_description | html %] [% sublanguage.region_description | html %] ([% sublanguage.rfc4646_subtag | html %])</a></li> > [% ELSE %] >- <li><a href="#lang_[% sublanguage.rfc4646_subtag | html %]">[% sublanguage.native_description | html %] ([% sublanguage.rfc4646_subtag | html %])</a></li> >+ <li><a href="#lang_[% sublanguage.rfc4646_subtag | uri %]">[% sublanguage.native_description | html %] ([% sublanguage.rfc4646_subtag | html %])</a></li> > [% END %] > [% END %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >index 7786e46718..f98a35ec4d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >@@ -21,7 +21,7 @@ > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> > [% IF ( import_batch_id ) %] > › >- <a href="[% script_name | html %]">Manage staged MARC records</a> >+ <a href="[% script_name | uri %]">Manage staged MARC records</a> > › Batch [% import_batch_id | html %] > [% ELSE %] > › Manage staged MARC records >@@ -267,7 +267,7 @@ > [% IF ( page.current_page ) %] > <span class="current">[% page.page_number | html %]</span> > [% ELSE %] >- <a href="[% page.script_name | html %]?offset=[% page.offset | html %]">[% page.page_number | html %]</a> >+ <a href="[% page.script_name | uri %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a> > [% END %] > [% END %] > </div> >@@ -287,7 +287,7 @@ > [% FOREACH batch_lis IN batch_list %] > <tr> > <td>[% batch_lis.import_batch_id | html %]</td> >- <td><a href="[% batch_lis.script_name | html %]?import_batch_id=[% batch_lis.import_batch_id | html %]">[% batch_lis.file_name | html %]</a></td> >+ <td><a href="[% batch_lis.script_name | uri %]?import_batch_id=[% batch_lis.import_batch_id | uri %]">[% batch_lis.file_name | html %]</a></td> > <td>[% batch_lis.comments | html %]</td> > <td>[% IF ( batch_lis.record_type == 'auth' ) %]Authority[% ELSE %]Bibliographic[% END %]</td> > <td> >@@ -309,7 +309,7 @@ > </td> > <td>[% batch_lis.upload_timestamp | html %]</td> > <td>[% batch_lis.num_records | html %]</td> >- <td>[% batch_lis.num_items | html %][% IF ( batch_lis.num_items ) %] <a href="[% batch_lis.script_name | html %]?import_batch_id=[% batch_lis.import_batch_id | html %]&op=create_labels">(Create label batch)</a>[% END %]</td> >+ <td>[% batch_lis.num_items | html %][% IF ( batch_lis.num_items ) %] <a href="[% batch_lis.script_name | uri %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&op=create_labels">(Create label batch)</a>[% END %]</td> > <td class="actions"> > [% IF ( batch_lis.can_clean ) %] > <form method="post" action="[% batch_lis.script_name | html %]" name="clean_batch_[% batch_lis.import_batch_id | html %]" id="clean_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_clean" > >@@ -334,7 +334,7 @@ > [% IF ( page.current_page ) %] > <span class="current">[% page.page_number | html %]</span> > [% ELSE %] >- <a href="[% page.script_name | html %]?offset=[% page.offset | html %]">[% page.page_number | html %]</a> >+ <a href="[% page.script_name | uri %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a> > [% END %] > [% END %] > </div> >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..7c83b01e9b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt >@@ -159,7 +159,7 @@ > [% IF ( op == 'show' ) %] > <td><input type="checkbox" name="borrowernumber" value="[% borrower.borrowernumber | html %]" checked="checked" /></td> > [% END %] >- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | html %]">[% borrower.cardnumber | html %]</a></td> >+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber | uri %]">[% borrower.cardnumber | html %]</a></td> > <td>[% borrower.surname | html %]</td> > <td>[% borrower.firstname | html %]</td> > <td>[% Branches.GetName( borrower.branchcode ) | html %]</td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >index 2afb535b2f..7538c8fe70 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt >@@ -61,7 +61,7 @@ > <div id="rulestabs" class="toptabs"> > <ul class="ui-tabs-nav"> > [% FOR tab IN tabs %] >- <li><a href="#[% tab.id | html %]" class="tab [% tab.id | html %]" data-number="[% tab.number | html %]"></a></li> >+ <li><a href="#[% tab.id | uri %]" class="tab [% tab.id | html %]" data-number="[% tab.number | html %]"></a></li> > [% END %] > </ul> > [% FOR tab IN tabs %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >index 95a2cd2773..3087d0afe8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/showdiffmarc.tt >@@ -46,7 +46,7 @@ > </div> > </div> > >-<p><a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | html %]">Return to staged MARC batch [% batchid | html %]</a></p> >+<p><a href="/cgi-bin/koha/tools/manage-marc-import.pl?import_batch_id=[% batchid | uri %]">Return to staged MARC batch [% batchid | html %]</a></p> > > [% MACRO jsinclude BLOCK %] > [% Asset.js("js/tools-menu.js") | $raw %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index 817fee9217..e90113a149 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >@@ -37,7 +37,7 @@ > </div> > </li> > [% END %] >- <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]">View final record</a></li> >+ <li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">View final record</a></li> > <li><a href="/cgi-bin/koha/tools/tools-home.pl">Back</a></li> > </ul> > <hr /> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >index 65569ffbc5..d56cd0afb0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -210,7 +210,7 @@ > <td>[% loopro.timestamp | html %]</td> > <td> > [% IF loopro.librarian %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.librarian.borrowernumber | html %]" title="display detail for this librarian."> [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname | html %] [% loopro.librarian.surname | html %] ([% loopro.librarian.borrowernumber | html %]) [% ELSE %][% loopro.librarian.borrowernumber | html %][% END %]</a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.librarian.borrowernumber | uri %]" title="display detail for this librarian."> [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname | html %] [% loopro.librarian.surname | html %] ([% loopro.librarian.borrowernumber | html %]) [% ELSE %][% loopro.librarian.borrowernumber | html %][% END %]</a> > [% ELSE %] > [% loopro.user | html %] > [% END %] >@@ -220,25 +220,25 @@ > <td> > [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %] > [% IF loopro.patron %] >- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object | html %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname | html %] [% loopro.patron.surname | html %] ([% loopro.object | html %]) [% ELSE %]Member [% loopro.object | html %][% END %][% END %] </a> >+ <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object | uri %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname | html %] [% loopro.patron.surname | html %] ([% loopro.object | html %]) [% ELSE %]Member [% loopro.object | html %][% END %][% END %] </a> > [% ELSE %] > [% loopro.object | html %] > [% END %] > [% ELSE %] > [% IF ( loopro.module == 'CATALOGUING' ) %] > [% IF ( loopro.info.substr(0, 4) == 'item' ) %] >- <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object | html %]&biblionumber=[% loopro.biblionumber | html %]&bi=[% loopro.biblioitemnumber | html %]#item[% loopro.object | html %]">Item [% loopro.object | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.object | uri %]&biblionumber=[% loopro.biblionumber | uri %]&bi=[% loopro.biblioitemnumber | uri %]#item[% loopro.object | uri %]">Item [% loopro.object | html %]</a> > [% ELSIF ( loopro.info.substr(0, 6) == 'biblio' ) %] >- <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object | html %]" title="Display detail for this biblio">Biblio [% loopro.object | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.object | uri %]" title="Display detail for this biblio">Biblio [% loopro.object | html %]</a> > [% ELSE %] > [% loopro.object | html %] > [% END %] > [% ELSE %] > [% IF ( loopro.module == 'SERIAL' ) %] >- <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object | html %]">Subscription [% loopro.object | html %] </a> >+ <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object | uri %]">Subscription [% loopro.object | html %] </a> > [% ELSE %] > [% IF ( loopro.module == 'AUTHORITIES' ) %] >- <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% loopro.object | html %]" title="Display detail for this authority">Authority [% loopro.object | html %]</a> >+ <a href="/cgi-bin/koha/authorities/detail.pl?authid=[% loopro.object | uri %]" title="Display detail for this authority">Authority [% loopro.object | html %]</a> > [% ELSE %] > [% loopro.object | html %] > [% END %] >@@ -248,7 +248,7 @@ > </td> > <td> > [% IF ( loopro.module == 'CIRCULATION' ) %] >- <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.info | html %]&biblionumber=[% loopro.biblionumber | html %]&bi=[% loopro.biblioitemnumber | html %]#item[% loopro.info | html %]" title="Display detail for this item">Item [% loopro.barcode | html %]</a> >+ <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% loopro.info | uri %]&biblionumber=[% loopro.biblionumber | uri %]&bi=[% loopro.biblioitemnumber | uri %]#item[% loopro.info | uri %]" title="Display detail for this item">Item [% loopro.barcode | html %]</a> > [% ELSE %] > [% loopro.info | html %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index b89db7687e..2370e0754f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -45,13 +45,13 @@ > [% END %] > [% IF shelf AND shelf.is_private %] › > [% IF op == 'view' OR op == 'edit_form' %] >- <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&category=[% PRIVATE | html %]">Your lists</a> >+ <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&category=[% PRIVATE | uri %]">Your lists</a> > [% ELSE %] > Your lists > [% END %] > [% ELSIF shelf AND shelf.is_public %] › > [% IF op == 'view' %] >- <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&category=[% PUBLIC | html %]">Public lists</a> >+ <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&category=[% PUBLIC | uri %]">Public lists</a> > [% ELSE %] > Public lists > [% END %] >@@ -168,7 +168,7 @@ > > [% UNLESS ( item_level_itypes ) %]<th>Item type</th>[% END %] > <th> >- <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | html %]&sortfield=title&direction=[% IF sortfield != 'title' %]asc[% ELSE %][% new_direction | html %][% END %]">Title</a> >+ <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]&sortfield=title&direction=[% IF sortfield != 'title' %]asc[% ELSE %][% new_direction | uri %][% END %]">Title</a> > [% IF sortfield == 'title' %] > <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" /> > [% ELSE %] >@@ -176,7 +176,7 @@ > [% END %] > </th> > <th> >- <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | html %]&sortfield=author&direction=[% IF sortfield != 'author' %]asc[% ELSE %][% new_direction | html %][% END %]">Author</a> >+ <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]&sortfield=author&direction=[% IF sortfield != 'author' %]asc[% ELSE %][% new_direction | uri %][% END %]">Author</a> > [% IF sortfield == 'author' %] > <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" /> > [% ELSE %] >@@ -184,7 +184,7 @@ > [% END %] > </th> > <th> >- <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | html %]&sortfield=dateadded&direction=[% IF sortfield != 'dateadded' %]asc[% ELSE %][% new_direction | html %][% END %]">Date added</a> >+ <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]&sortfield=dateadded&direction=[% IF sortfield != 'dateadded' %]asc[% ELSE %][% new_direction | uri %][% END %]">Date added</a> > [% IF sortfield == 'dateadded' %] > <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" /> > [% ELSE %] >@@ -192,7 +192,7 @@ > [% END %] > </th> > <th> >- <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | html %]&sortfield=itemcallnumber&direction=[% IF sortfield != 'itemcallnumber' %]asc[% ELSE %][% new_direction | html %][% END %]">Call number</a> >+ <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]&sortfield=itemcallnumber&direction=[% IF sortfield != 'itemcallnumber' %]asc[% ELSE %][% new_direction | uri %][% END %]">Call number</a> > [% IF sortfield == 'itemcallnumber' %] > <img src="[% interface | html %]/[% theme | html %]/img/[% direction | html %].gif" alt="[% direction | html %] sort" /> > [% ELSE %] >@@ -223,16 +223,16 @@ > [% ELSE %] > [% IF ( itemsloo.ITEM_RESULTS.size ) %] > <a id="reserve_[% itemsloo.biblionumber | html %]" href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]">Holds</a> >- [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | html %]&findborrower=[% holdfor_cardnumber | html %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %] >+ [% IF ( holdfor ) %] <span class="holdforlink">| <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% itemsloo.biblionumber | uri %]&findborrower=[% holdfor_cardnumber | uri %]">Place hold for [% holdfor_firstname | html %] [% holdfor_surname | html %] ([% holdfor_cardnumber | html %])</a></span>[% END %] > [% ELSE %] > <span class="noholdstext">No holds allowed</span> > [% END %] > [% END %] > [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] >- | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% itemsloo.biblionumber | html %]">Edit record</a> >+ | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit record</a> > [% END %] > [% IF ( CAN_user_editcatalogue_edit_items ) %] >- | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% itemsloo.biblionumber | html %]">Edit items</a> >+ | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% itemsloo.biblionumber | uri %]">Edit items</a> > [% END %] > </p> > </td> >@@ -321,12 +321,12 @@ > <fieldset class="action"> > <input type="submit" value="Save" class="submit" /> > [% IF referer == 'view' %] >- <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | html %]" class="cancel">Cancel</a> >+ <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a> > [% ELSE %] > [% IF category == PUBLIC %] >- <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&category=[% PUBLIC | html %]" class="cancel">Cancel</a> >+ <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&category=[% PUBLIC | uri %]" class="cancel">Cancel</a> > [% ELSE %] >- <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&category=[% PRIVATE | html %]" class="cancel">Cancel</a> >+ <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&category=[% PRIVATE | uri %]" class="cancel">Cancel</a> > [% END %] > [% END %] > </fieldset> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc >index 074b87ce70..a309e01856 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc >@@ -24,7 +24,7 @@ > [% IF ( authid ) %] > <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a> > [% ELSE %] >- <a href="[% searchurl | url %][% heading | html %]">[% heading | html %]</a> >+ <a href="[% searchurl | url %][% heading | uri %]">[% heading | html %]</a> > [% END %] > [% ELSE %] > [% heading | html %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc >index 1d31707d48..7671e6dd81 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-langmenu.inc >@@ -11,7 +11,7 @@ > [% IF ( sublanguages_loo.sublanguage_current ) %] > <li role="presentation"> <a href="#" tabindex="-1" role="menuitem">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] <i class="fa fa-check"></i></a></li> > [% ELSE %] >- <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | html %]" tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li> >+ <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]" tabindex="-1" role="menuitem"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %]</a></li> > [% END %] > [% END # / IF sublanguages_loo.enabled %] > [% END # / FOREACH sublanguages_loo %] >@@ -20,7 +20,7 @@ > [% IF ( languages_loo.current ) %] > <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %] <i class="fa fa-check"></i></a></li> > [% ELSE %] >- <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag | html %]" tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li> >+ <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]" tabindex="-1" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li> > [% END %] > [% END # / IF languages_loo.current %] > [% END # / IF ( languages_loo.plural ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >index 11628178a4..342e1b85cc 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc >@@ -38,7 +38,7 @@ > <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=2" tabindex="-1" role="menuitem"><strong>Public lists</strong></a></li> > [% SET number_of_public_shelves = 0 %] > [% FOREACH s IN some_public_shelves %] >- <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber | html %]&sortfield=[% s.sortfield | html %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a></li> >+ <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber | uri %]&sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a></li> > [% SET number_of_public_shelves = number_of_public_shelves + 1 %] > [% IF number_of_public_shelves >= 10 %][% LAST | html %][% END %] > [% END %] >@@ -55,7 +55,7 @@ > [% IF some_private_shelves.count %] > [% SET number_of_private_shelves = 0 %] > [% FOREACH s IN some_private_shelves %] >- <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber | html %]&sortfield=[% s.sortfield | html %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a></li> >+ <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber | uri %]&sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a></li> > [% SET number_of_private_shelves = number_of_private_shelves + 1 %] > [% IF number_of_private_shelves >= 10 %][% LAST | html %][% END %] > [% END %] >@@ -307,7 +307,7 @@ > </div> > [% ELSE %] > <h4>Shibboleth login</h4> >- <p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl | html %]">click here to login</a>.</p> >+ <p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl | uri %]">click here to login</a>.</p> > <h4>Local Login</h4> > [% END %] > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc >index 28518b9b84..27c5296210 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-authorities.inc >@@ -11,7 +11,7 @@ > [% IF ( node.current_value ) %] > <span class="currentauth">[% node.value | html %]</span> > [% ELSE %] >- <a href="opac-authoritiesdetail.pl?authid=[% node.authid | html %]" title="Term">[% node.value | html %]</a> >+ <a href="opac-authoritiesdetail.pl?authid=[% node.authid | uri %]" title="Term">[% node.value | html %]</a> > [% END %] > [% IF ( node.children && node.children.size > 0 ) %] > [% PROCESS showtree tree = node.children %] >@@ -52,8 +52,8 @@ > [% END %] > > [% BLOCK authheadingdisplay %] >- [% IF authid %]<a href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% authid | html %]">[% heading | html %]</a> >- [% ELSIF search %]<a href="/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operator=contains&marclist=mainentry&and_or=and&orderby=HeadingAsc&value=[% search | html %]">[% heading | html %]</a> >+ [% IF authid %]<a href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% authid | uri %]">[% heading | html %]</a> >+ [% ELSIF search %]<a href="/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operator=contains&marclist=mainentry&and_or=and&orderby=HeadingAsc&value=[% search | uri %]">[% heading | html %]</a> > [% ELSE %][% heading | html %] > [% END %] > [% END %] >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 3f374b5254..fa7459ddc5 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -52,7 +52,7 @@ > [% IF ( sublanguages_loo.sublanguage_current ) %] > <li> <p>[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</p></li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | html %]"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li> >+ <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a></li> > [% END %] > [% END # / IF sublanguages_loo.enabled %] > [% END # / FOREACH sublanguages_loo %] >@@ -63,7 +63,7 @@ > [% IF ( languages_loo.current ) %] > <li class="active"><p class="navbar-text">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</p></li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag | html %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li> >+ <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description | html %][% ELSE %][% languages_loo.rfc4646_subtag | html %][% END %]</a></li> > [% END %] > [% END # / IF languages_loo.current %] > [% END # / IF ( languages_loo.plural ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc >index dcf075e487..218cda6c2e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc >@@ -8,9 +8,9 @@ > <ul> > <li> > [% IF ( available ) %] >- <strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi_not_availablity | html %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">Show all items</a> >+ <strong>Showing only available items</strong></li><li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi_not_availablity | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]">Show all items</a> > [% ELSE %] >- <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi |url %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]&limit=available">Limit to currently available items.</a> >+ <a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi |url %][% IF ( sort_by ) %]&sort_by=[% sort_by |url %][% END %]&limit=available">Limit to currently available items.</a> > [% END %] > </li> > </ul> >@@ -43,10 +43,10 @@ > [% IF facet.active %] > [% SET local_url = url _ "&nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] > <span class="facet-label">[% facet.facet_label_value | html %]</span> >- [<a href="[% local_url | html %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>] >+ [<a href="[% local_url | uri %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>] > [% ELSE %] > [% SET local_url = url _ "&limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %] >- <span class="facet-label"><a href="[% local_url | html %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span> >+ <span class="facet-label"><a href="[% local_url | uri %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span> > [% IF ( displayFacetCount ) %] > <span class="facet-count"> ([% facet.facet_count | html %])</span> > [% END %] >@@ -55,7 +55,7 @@ > [% END %] > [% IF ( facets_loo.expandable ) %] > <li class="showmore"> >- <a href="[% url | html %][% IF offset %]&offset=[% offset |url %][% END %]&expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a> >+ <a href="[% url | uri %][% IF offset %]&offset=[% offset |url %][% END %]&expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a> > </li> > [% END %] > </ul> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc >index 01f8a026af..71cf3cff1e 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc >@@ -3,19 +3,19 @@ > [% IF hits_to_paginate < total %]<h6>[% hits_to_paginate | html %] of [% total | html %] results loaded, refine your search to view other records</h6>[% END %] > <ul> > [% IF ( previous_page_offset.defined ) %] >- <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %][% IF ( sort_by ) %]&sort_by=[% sort_by | html %][% END %]">First</a></li> >- <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&offset=[% previous_page_offset | html %][% IF ( sort_by ) %]&sort_by=[% sort_by | html %][% END %]">« Previous</a></li> >+ <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]">First</a></li> >+ <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]&offset=[% previous_page_offset | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]">« Previous</a></li> > [% END %] > [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %] > [% IF ( PAGE_NUMBER.highlight ) %] > <li class="active"><a href="#">[% PAGE_NUMBER.pg | html %]</a></li> > [% ELSE %] >- <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&offset=[% PAGE_NUMBER.offset | html %][% IF ( sort_by ) %]&sort_by=[% sort_by | html %][% END %]">[% PAGE_NUMBER.pg | html %]</a></li> >+ <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]&offset=[% PAGE_NUMBER.offset | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]">[% PAGE_NUMBER.pg | html %]</a></li> > [% END %] > [% END %] > [% IF ( next_page_offset ) %] >- <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&offset=[% next_page_offset | html %][% IF ( sort_by ) %]&sort_by=[% sort_by | html %][% END %]">Next »</a></li> >- <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&offset=[% last_page_offset | html %][% IF ( sort_by ) %]&sort_by=[% sort_by | html %][% END %]">Last</a></li> >+ <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]&offset=[% next_page_offset | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]">Next »</a></li> >+ <li><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]&offset=[% last_page_offset | uri %][% IF ( sort_by ) %]&sort_by=[% sort_by | uri %][% END %]">Last</a></li> > [% END %] > </ul> > </div> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >index e36ce82a68..276c0d2d5c 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >@@ -13,14 +13,14 @@ > <td rowspan="2"> > [% IF shelfbrowser_prev_item %] > <div id="browser_previous"> >- <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% shelfbrowser_prev_item.biblionumber | html %]&shelfbrowse_itemnumber=[% shelfbrowser_prev_item.itemnumber | html %]#shelfbrowser" data-prev-itemnumber="[% shelfbrowser_prev_item.itemnumber | html %]">Previous</a> >+ <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% shelfbrowser_prev_item.biblionumber | uri %]&shelfbrowse_itemnumber=[% shelfbrowser_prev_item.itemnumber | uri %]#shelfbrowser" data-prev-itemnumber="[% shelfbrowser_prev_item.itemnumber | html %]">Previous</a> > </div> > [% END %] > </td> > > [% FOREACH item IN shelfbrowser_items %] > <td> >- <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | html %]&shelfbrowse_itemnumber=[% item.itemnumber | html %]#shelfbrowser"> >+ <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | uri %]&shelfbrowse_itemnumber=[% item.itemnumber | uri %]#shelfbrowser"> > [% IF ( OPACLocalCoverImages ) %] > <div title="[% item.biblionumber |url %]" class="[% item.biblionumber | html %] thumbnail-shelfbrowser" id="local-thumbnail-shelf-[% item.biblionumber | html %]"></div> > [% END %] >@@ -67,7 +67,7 @@ > <td rowspan="2"> > [% IF shelfbrowser_next_item %] > <div id="browser_next"> >- <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% shelfbrowser_next_item.biblionumber | html %]&shelfbrowse_itemnumber=[% shelfbrowser_next_item.itemnumber | html %]#shelfbrowser" data-next-itemnumber="[% shelfbrowser_next_item.itemnumber | html %]">Next</a> >+ <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% shelfbrowser_next_item.biblionumber | uri %]&shelfbrowse_itemnumber=[% shelfbrowser_next_item.itemnumber | uri %]#shelfbrowser" data-next-itemnumber="[% shelfbrowser_next_item.itemnumber | html %]">Next</a> > </div> > [% END %] > </td> >@@ -77,7 +77,7 @@ > [% FOREACH item IN shelfbrowser_items %] > <td class="top"> > [% item.itemcallnumber | html %] >- <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | html %]&shelfbrowse_itemnumber=[% item.itemnumber | html %]#shelfbrowser"> >+ <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | uri %]&shelfbrowse_itemnumber=[% item.itemnumber | uri %]#shelfbrowser"> > [% item.title | html %] > [% FOREACH subtitl IN item.subtitle %] > [% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt >index e1e242d431..92b4eb50e8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt >@@ -67,7 +67,7 @@ > <h3>Report issues and broken links</h3> > <ul> > <li>To report this error, please contact the Koha Administrator. >- <a href="mailto:[% admin | html %]">Send email</a>.</li> >+ <a href="mailto:[% admin | uri %]">Send email</a>.</li> > </ul> > </div> <!-- / #errormsg[% errno | html %] --> > </div> <!-- / .span10/12 --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt >index 3445bbfac8..50cd287b18 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt >@@ -32,7 +32,7 @@ > [% Koha.Preference( 'OpacMaintenanceNotice' ) | html %] > [% ELSE %] > <h2>System Maintenance</h2> >- <p>The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the <a href="mailto:[% KohaAdminEmailAddress | html %]">site administrator</a></p> >+ <p>The [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog is offline for system maintenance. We'll be back soon! If you have any questions, please contact the <a href="mailto:[% KohaAdminEmailAddress | uri %]">site administrator</a></p> > [% END %] > </div> > </div> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt >index 8cbc5a9f49..11e389ace1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt >@@ -120,7 +120,7 @@ > <ul> > [% FOREACH advsearchloo IN advancedsearchesloop %] > <li id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]"> >- <a href="#advsearch-[% advsearchloo.advanced_search_type | html %]"> >+ <a href="#advsearch-[% advsearchloo.advanced_search_type | uri %]"> > [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]Item type > [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]Collection > [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]Shelving location >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt >index 806acbf063..bf83086bfe 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt >@@ -10,7 +10,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]">Details for [% bibliotitle | html %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]">Details for [% bibliotitle | html %]</a> <span class="divider">›</span></li> > <li><a href="#">[% IF ( typeissue ) %]Subscribe to a subscription alert [% ELSIF ( typeissuecancel ) %] Unsubscribe from a subscription alert [% END %]</a></li> > </ul> > >@@ -43,7 +43,7 @@ > <input type="hidden" name="biblionumber" value="[% biblionumber | html %]"> > <input type="hidden" name="op" value="cancel_confirmed"> > <input type="submit" value="Yes" class="btn"> >- <a href="opac-serial-issues.pl?biblionumber=[% biblionumber | html %]" class="cancel">No</a> >+ <a href="opac-serial-issues.pl?biblionumber=[% biblionumber | uri %]" class="cancel">No</a> > </form> > [% END %] > </div> <!-- / #useralertsubscribe --> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >index 696b09d17f..38674558d4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt >@@ -46,13 +46,13 @@ > [% END %] > > <h1>Entry [% authtypetext | html %]</h1> >- <p><a href="opac-search.pl?type=opac&q=[% authid | html %]&idx=an,phr">Number of records used in: [% count | html %]</a></p> >+ <p><a href="opac-search.pl?type=opac&q=[% authid | uri %]&idx=an,phr">Number of records used in: [% count | html %]</a></p> > [% FOREACH Tag0X IN Tab0XX %] > <p><b>[% Tag0X.tag | html %]</b></p> > <ul> > [% FOREACH subfiel IN Tag0X.subfield %] > <li><b>[% subfiel.marc_lib | $raw %]:</b> >- [% IF subfiel.isurl %]<a href="[% subfiel.marc_value | html %]">[% subfiel.marc_value | html %]</a> >+ [% IF subfiel.isurl %]<a href="[% subfiel.marc_value | uri %]">[% subfiel.marc_value | html %]</a> > [% ELSE %][% subfiel.marc_value | html %][% END %]</li> > [% END %] > </ul> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >index 7270021a30..7d19e6b686 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt >@@ -48,7 +48,7 @@ > <h1>[% summary.mainentry | html %][% IF authtypetext %] ([% authtypetext | html %])[% END %]</h1> > > <div class="usedin"> >- [% IF count %]<a href="/cgi-bin/koha/opac-search.pl?type=opac&q=[% authid | html %]&idx=an,phr">Number of records used in: [% count | html %]</a>[% ELSE %]This authority is not used in any records.[% END %] >+ [% IF count %]<a href="/cgi-bin/koha/opac-search.pl?type=opac&q=[% authid | uri %]&idx=an,phr">Number of records used in: [% count | html %]</a>[% ELSE %]This authority is not used in any records.[% END %] > </div> > > <div class="authstanza"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >index ccaddde454..765a6d56ba 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt >@@ -91,7 +91,7 @@ > </div> > [% ELSE %] > <h4>Shibboleth Login</h4> >- <p><a href="[% shibbolethLoginUrl | html %]">If you have a Shibboleth account, please click here to log in.</a></p> >+ <p><a href="[% shibbolethLoginUrl | uri %]">If you have a Shibboleth account, please click here to log in.</a></p> > [% END %] > [% IF ( casAuthentication ) %] > <h4>CAS login</h4> >@@ -106,14 +106,14 @@ > [% IF ( casAuthentication ) %] > [% IF ( shibbolethAuthentication ) %] > [% IF ( casServerUrl ) %] >- <p><a href="[% casServerUrl | html %]">Please click here to log in.</a><p> >+ <p><a href="[% casServerUrl | uri %]">Please click here to log in.</a><p> > [% END %] > > [% IF ( casServersLoop ) %] > <p>Please choose against which one you would like to authenticate: </p> > <ul> > [% FOREACH casServer IN casServersLoop %] >- <li><a href="[% casServer.value | html %]">[% casServer.name | html %]</a></li> >+ <li><a href="[% casServer.value | uri %]">[% casServer.name | html %]</a></li> > [% END %] > </ul> > [% END %] >@@ -126,14 +126,14 @@ > [% END %] > > [% IF ( casServerUrl ) %] >- <p><a href="[% casServerUrl | html %]">If you have a CAS account, please click here to log in.</a><p> >+ <p><a href="[% casServerUrl | uri %]">If you have a CAS account, please click here to log in.</a><p> > [% END %] > > [% IF ( casServersLoop ) %] > <p>If you have a CAS account, please choose against which one you would like to authenticate:</p> > <ul> > [% FOREACH casServer IN casServersLoop %] >- <li><a href="[% casServer.value | html %]">[% casServer.name | html %]</a></li> >+ <li><a href="[% casServer.value | uri %]">[% casServer.name | html %]</a></li> > [% END %] > </ul> > [% END %] >@@ -201,7 +201,7 @@ > [% ELSE %] > <h4>Logging on to the catalog has not been enabled by the library.</h4> > <ul> >- <li>To report this error, you can email the Koha Administrator.<a href="mailto:[% admin | html %]">Email</a></li> >+ <li>To report this error, you can email the Koha Administrator.<a href="mailto:[% admin | uri %]">Email</a></li> > <li>Use top menu bar to navigate to another part of Koha.</li> > </ul> > [% END # / IF opacuserlogin %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >index 18c95f97f4..f664058015 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >@@ -7,7 +7,7 @@ > <ul> > [% IF ( displayprev ) %] > <li> >- <a href="opac-authorities-home.pl?startfrom=[% startfromprev | html %]&[% FOREACH searchdat IN searchdata %][% searchdat.term | html %]=[% searchdat.val |url %]&[% END %]resultsperpage=[% resultsperpage | html %]&type=opac&op=do_search&authtypecode=[% authtypecode | html %]&orderby=[% orderby | html %]"> >+ <a href="opac-authorities-home.pl?startfrom=[% startfromprev | uri %]&[% FOREACH searchdat IN searchdata %][% searchdat.term | uri %]=[% searchdat.val |url %]&[% END %]resultsperpage=[% resultsperpage | uri %]&type=opac&op=do_search&authtypecode=[% authtypecode | uri %]&orderby=[% orderby | uri %]"> > « > </a> > </li> >@@ -16,12 +16,12 @@ > [% IF ( number.highlight ) %] > <li class="active"><a href="#">[% number.number | html %]</a></li> > [% ELSE %] >- <li><a href="opac-authorities-home.pl?startfrom=[% number.startfrom | html %]&[% FOREACH searchdat IN number.searchdata %][% searchdat.term | html %]=[% searchdat.val |url %]&[% END %]resultsperpage=[% resultsperpage | html %]&type=opac&op=do_search&authtypecode=[% authtypecode | html %]&orderby=[% orderby | html %]">[% number.number | html %]</a></li> >+ <li><a href="opac-authorities-home.pl?startfrom=[% number.startfrom | uri %]&[% FOREACH searchdat IN number.searchdata %][% searchdat.term | uri %]=[% searchdat.val |url %]&[% END %]resultsperpage=[% resultsperpage | uri %]&type=opac&op=do_search&authtypecode=[% authtypecode | uri %]&orderby=[% orderby | uri %]">[% number.number | html %]</a></li> > [% END %] > [% END %] > [% IF ( displaynext ) %] > <li> >- <a href="opac-authorities-home.pl?startfrom=[% startfromnext | html %]&[% FOREACH searchdat IN searchdata %][% searchdat.term | html %]=[% searchdat.val |url %]&[% END %]&resultsperpage=[% resultsperpage | html %]&type=opac&op=do_search&authtypecode=[% authtypecode | html %]&orderby=[% orderby | html %]">»</a> >+ <a href="opac-authorities-home.pl?startfrom=[% startfromnext | uri %]&[% FOREACH searchdat IN searchdata %][% searchdat.term | uri %]=[% searchdat.val |url %]&[% END %]&resultsperpage=[% resultsperpage | uri %]&type=opac&op=do_search&authtypecode=[% authtypecode | uri %]&orderby=[% orderby | uri %]">»</a> > </li> > [% END %] > </ul> >@@ -88,11 +88,11 @@ > [% FOREACH resul IN result %] > <tr> > <td>[% PROCESS authresult summary=resul.summary %]</td> >- <td><a href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% resul.authid | html %]">Details</a> >+ <td><a href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% resul.authid | uri %]">Details</a> > <td>[% resul.authtype | html %]</td> > [% UNLESS ( resul.isEDITORS ) %] > <td> >- [% IF resul.used > 0 %]<a href="/cgi-bin/koha/opac-search.pl?type=opac&op=do_search&q=an=[% resul.authid | html %]">[% resul.used | html %] biblios</a>[% ELSE %]0 biblios[% END %] >+ [% IF resul.used > 0 %]<a href="/cgi-bin/koha/opac-search.pl?type=opac&op=do_search&q=an=[% resul.authid | uri %]">[% resul.used | html %] biblios</a>[% ELSE %]0 biblios[% END %] > </td> > [% END %] > </tr> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt >index edb6ef4f3c..a462f79507 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt >@@ -148,7 +148,7 @@ > [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %] > <p> > [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] >- - <a href="[% MARCNOTE.marcnote | html %]">[% MARCNOTE.marcnote | html %]</a> >+ - <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a> > [% ELSE %] > - [% MARCNOTE.marcnote | html %] > [% END %] >@@ -201,9 +201,9 @@ > [% IF MARCurl.part %]<p>[% MARCurl.part | html %]</p>[% END %] > > [% IF OPACURLOpenInNewWindow %] >- <a href="[% MARCurl.MARCURL | html %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer">[% MARCurl.linktext | html %]</a> >+ <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer">[% MARCurl.linktext | html %]</a> > [% ELSE %] >- <a href="[% MARCurl.MARCURL | html %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a> >+ <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a> > [% END %] > > [% IF MARCurl.notes %][% FOREACH note IN MARCurl.notes %]<p>[% note.note | html %]</p>[% END %][% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt >index aa04c76d96..71bac82e51 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt >@@ -32,7 +32,7 @@ > <ul> > [% FOREACH HIERARCHY_LOO IN HIERARCHY_LOOP %] > <li> >- <a href="opac-browser.pl?level=[% HIERARCHY_LOO.level | html %]&filter=[% HIERARCHY_LOO.classification |uri %]">[% HIERARCHY_LOO.description | html %]</a> >+ <a href="opac-browser.pl?level=[% HIERARCHY_LOO.level | uri %]&filter=[% HIERARCHY_LOO.classification |uri %]">[% HIERARCHY_LOO.description | html %]</a> > </li> > <li style="list-style-type: none;"> > [% END %] >@@ -45,7 +45,7 @@ > [% IF ( LEVEL_LOO.endnode ) %] > <a href="opac-search.pl?q=Dewey-classification:[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description | html %]</a> > [% ELSE %] >- <a href="opac-browser.pl?level=[% LEVEL_LOO.level | html %]&filter=[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description | html %]</a> >+ <a href="opac-browser.pl?level=[% LEVEL_LOO.level | uri %]&filter=[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description | html %]</a> > [% END %] > </p> > <p style="font-size:0.75em"><i>([% LEVEL_LOO.number | html %] biblios)</i></p> >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 e77a9a2020..e2d8a8703e 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 >@@ -68,7 +68,7 @@ > <tbody> > [% FOREACH cr IN course_reserves %] > <tr> >- <td><a href="opac-detail.pl?biblionumber=[% cr.biblio.biblionumber | html %]">[% cr.biblio.title | html %]</a></td> >+ <td><a href="opac-detail.pl?biblionumber=[% cr.biblio.biblionumber | uri %]">[% cr.biblio.title | html %]</a></td> > <td>[% cr.biblio.author | html %]</td> > <td>[% ItemTypes.GetDescription( cr.item.itype ) | html %]</td> > <td>[% Branches.GetName( cr.item.holdingbranch ) | html %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) | html %]</i></td> >@@ -84,9 +84,9 @@ > [% END %] > </td> > <td>[% IF (cr.item.uri) %] >- <a href="[% cr.item.uri | html %]">Item URI</a> >+ <a href="[% cr.item.uri | uri %]">Item URI</a> > [% ELSIF (cr.biblioitem.url) %] >- <a href="[% cr.biblioitem.url | html %]">Record URL</a> >+ <a href="[% cr.biblioitem.url | uri %]">Record URL</a> > [% END %] > </td> > </tr> >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 c53e991b55..1f055ae337 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 >@@ -42,7 +42,7 @@ > <tbody> > [% FOREACH c IN courses %] > <tr> >- <td><a href="opac-course-details.pl?course_id=[% c.course_id | html %]">[% c.course_name | html %]</a></td> >+ <td><a href="opac-course-details.pl?course_id=[% c.course_id | uri %]">[% c.course_name | html %]</a></td> > <td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', c.department, 1 ) | html %]</td> > <td>[% c.course_number | html %]</td> > <td>[% c.section | html %]</td> >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..e524dd9c54 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -59,9 +59,9 @@ > [% END %] > [% IF ( OPACAmazonCoverImages ) %] > [% IF ( OPACURLOpenInNewWindow ) %] >- <a href="http://www.amazon[% AmazonTld | html %]/gp/reader/[% normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link" target="_blank" rel="noreferrer"> >+ <a href="http://www.amazon[% AmazonTld | uri %]/gp/reader/[% normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link" target="_blank" rel="noreferrer"> > [% ELSE %] >- <a href="http://www.amazon[% AmazonTld | html %]/dp/[% normalized_isbn | html %][% AmazonAssocTag | html %]"> >+ <a href="http://www.amazon[% AmazonTld | uri %]/dp/[% normalized_isbn | uri %][% AmazonAssocTag | uri %]"> > [% END %] > <img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn | html %].01.MZZZZZZZ.jpg" alt="Cover image" /></a> > [% END %] >@@ -88,9 +88,9 @@ > [% IF ( BakerTaylorEnabled && bt_id ) %] > [% IF BakerTaylorBookstoreURL %] > [% IF ( OPACURLOpenInNewWindow ) %] >- <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]" target="_blank" rel="noreferrer"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]" target="_blank" rel="noreferrer"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> > [% ELSE %] >- <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> > [% END %] > [% ELSE %] > <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /> >@@ -184,7 +184,7 @@ > <a class='authlink' href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% MARCAUTHOR.authoritylink | html %]"><img style="vertical-align:middle" height="15" width="15" src="[% interface | html %]/[% theme | html %]/images/filefind.png"></a> > [% END %] > [% IF IDREF and MARCAUTHOR.unimarc3 %] >- <a href="/cgi-bin/koha/opac-idref.pl?unimarc3=[% MARCAUTHOR.unimarc3 | html %]" title="IdRef" rel="gb_page_center[600,500]">IdRef</a> >+ <a href="/cgi-bin/koha/opac-idref.pl?unimarc3=[% MARCAUTHOR.unimarc3 | uri %]" title="IdRef" rel="gb_page_center[600,500]">IdRef</a> > [% END %] > [% UNLESS ( loop.last ) %]|[% END %] > [% END # /FOREACH MARCAUTHORS %] >@@ -337,15 +337,15 @@ > > [% IF ( OPACURLOpenInNewWindow ) %] > [% IF trackclicks == 'track' || trackclicks == 'anonymous' %] >- <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]&biblionumber=[% biblio.biblionumber | html %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer"> >+ <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]&biblionumber=[% biblio.biblionumber | uri %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer"> > [% ELSE %] >- <a href="[% MARCurl.MARCURL | html %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer"> >+ <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]" target="_blank" rel="noreferrer"> > [% END %] > [% ELSE %] > [% IF trackclicks == 'track' || trackclicks == 'anonymous' %] >- <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]&biblionumber=[% biblio.biblionumber | html %]" title="[% MARCurl.MARCURL | html %]"> >+ <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]&biblionumber=[% biblio.biblionumber | uri %]" title="[% MARCurl.MARCURL | html %]"> > [% ELSE %] >- <a href="[% MARCurl.MARCURL | html %]" title="[% MARCurl.MARCURL | html %]"> >+ <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]"> > [% END %] > [% END %] > [% MARCurl.linktext | html %]</a> >@@ -380,7 +380,7 @@ > [% IF shelves.count %] > <span class="results_summary lists"><span class="label">List(s) this item appears in: </span> > [% FOREACH s IN shelves %] >- <a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber | html %]">[% s.shelfname | html %]</a> >+ <a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a> > [% IF ( loop.last ) %][% ELSE %]|[% END %] > [% END %] > </span> >@@ -503,7 +503,7 @@ > [% IF ( BakerTaylorContentURL ) %] > <span class="results_summary"> > <span class="label">Enhanced content: </span> >- [% IF ( OPACURLOpenInNewWindow ) %]<a href="[% BakerTaylorContentURL | html %]" target="_blank" rel="noreferrer">Content Cafe</a>[% ELSE %]<a href="[% BakerTaylorContentURL | html %]">Content Cafe</a>[% END %] >+ [% IF ( OPACURLOpenInNewWindow ) %]<a href="[% BakerTaylorContentURL | uri %]" target="_blank" rel="noreferrer">Content Cafe</a>[% ELSE %]<a href="[% BakerTaylorContentURL | html %]">Content Cafe</a>[% END %] > </span> > [% END # / IF BakerTaylorContentURL %] > >@@ -555,7 +555,7 @@ > [% IF ( LibraryThingForLibrariesID ) %] > <li id="tab_LTFLreviews"> > <script src="https://www.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID | html %]"></script> >- <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID | html %]&accessibility=1">here</a>.</noscript> >+ <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID | uri %]&accessibility=1">here</a>.</noscript> > </li> > [% END %] > [% END %] >@@ -634,7 +634,7 @@ > > <div id="holdings"> > [% IF too_many_items %] >- <p>This record has many physical items ([% items_count | html %]). <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]&viewallitems=1">Click here to view them all.</a></p> >+ <p>This record has many physical items ([% items_count | html %]). <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]&viewallitems=1">Click here to view them all.</a></p> > [% ELSIF ( itemloop.size ) %] > [% INCLUDE items_table items=itemloop tab="holdings" table_id="holdingst" %] > [% IF Koha.Preference('OPACAcquisitionDetails') and acquisition_details.total_quantity > 0 %] >@@ -705,7 +705,7 @@ > [% FOREACH MARCNOTE IN MARCNOTES %] > <p> > [% IF MARCNOTE.marcnote.match('^https?://\S+$') %] >- <a href="[% MARCNOTE.marcnote | html %]">[% MARCNOTE.marcnote | html %]</a> >+ <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a> > [% ELSE %] > [% MARCNOTE.marcnote FILTER html_line_break | html %] > [% END %] >@@ -863,7 +863,7 @@ > </table> > [% END # / IF subscription.latestserials %] > [% END # / FOREACH subscriptions %] >- <p class="subscription_moredetails"><a href="opac-serial-issues.pl?biblionumber=[% biblio.biblionumber | html %]">More details</a></p> >+ <p class="subscription_moredetails"><a href="opac-serial-issues.pl?biblionumber=[% biblio.biblionumber | uri %]">More details</a></p> > </div> <!-- / #subscriptions --> > [% END # IF subscriptionsnumber %] > >@@ -982,7 +982,7 @@ > [% UNLESS ( item_level_itypes ) %] > <td>[% XISBN.description | html %]</td> > [% END %] >- <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% XISBN.biblionumber | html %]">[% XISBN.title | html %]</a> >+ <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% XISBN.biblionumber | uri %]">[% XISBN.title | html %]</a> > [% IF ( XISBN.author ) %]<span> by </span>[% XISBN.author | html %][% END %] > [% IF ( XISBN.copyrightdate ) %]<span> ©</span>[% XISBN.copyrightdate | html %][% END %] > [% IF ( XISBN.publishercode ) %] >@@ -1075,16 +1075,16 @@ > <ul class="pg_menu clearfix"> > <li class="left_results"> > [% IF ( previousBiblionumber ) %] >- <a href="opac-detail.pl?biblionumber=[% previousBiblionumber | html %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( previousTitle ) %][% previousTitle | html %][% ELSE %]previous biblio[% END %]"><i class="fa fa-angle-double-left"></i> Previous</a> >+ <a href="opac-detail.pl?biblionumber=[% previousBiblionumber | uri %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( previousTitle ) %][% previousTitle | html %][% ELSE %]previous biblio[% END %]"><i class="fa fa-angle-double-left"></i> Previous</a> > [% ELSE %] > <span>Previous</span> > [% END %] > </li> > [%# busc is already URI encoded %] >- <li class="back_results"><a href="opac-search.pl?[% busc | html %]" title="Back to the results search list">Back to results</a></li> >+ <li class="back_results"><a href="opac-search.pl?[% busc | uri %]" title="Back to the results search list">Back to results</a></li> > <li class="right_results"> > [% IF ( nextBiblionumber ) %] >- <a href="opac-detail.pl?biblionumber=[% nextBiblionumber | html %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( nextTitle ) %][% nextTitle | html %][% ELSE %]next biblio[% END %]">Next <i class="fa fa-angle-double-right"></i></a> >+ <a href="opac-detail.pl?biblionumber=[% nextBiblionumber | uri %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( nextTitle ) %][% nextTitle | html %][% ELSE %]next biblio[% END %]">Next <i class="fa fa-angle-double-right"></i></a> > [% ELSE %] > <span>Next</span> > [% END %] >@@ -1100,7 +1100,7 @@ > [% ELSE %] > <li class="li_pag_[% loop.count | html %]"> > [% END %] >- <a href="opac-detail.pl?biblionumber=[% listitem.biblionumber | html %]&query_desc=[% query_desc |uri %]" title="View record "[% listitem.title | html %]"" class="a_pag" id="a_pag_[% loop.count | html %]">[% loop.count + offset | html %]</a></li> >+ <a href="opac-detail.pl?biblionumber=[% listitem.biblionumber | uri %]&query_desc=[% query_desc |uri %]" title="View record "[% listitem.title | html %]"" class="a_pag" id="a_pag_[% loop.count | html %]">[% loop.count + offset | html %]</a></li> > [% END %] > </ul> > </div> >@@ -1108,9 +1108,9 @@ > <ul id="ul_pagination_lists"> > [% FOREACH listitem IN listResults %] > [% IF ( listitem.biblionumber == biblionumber ) %] >- <li id="li_pag_[% loop.count | html %]" class="highlight" title="Go to detail"><span class="li_pag_index"><i class="fa fa-arrow-left"></i> [% loop.count + offset | html %]</span><a href="opac-detail.pl?biblionumber=[% biblionumber | html %]&query_desc=[% query_desc |uri %]">[% title | html %]</a><br> [% IF ( author ) %]by [% author | html %][% END %]</li> >+ <li id="li_pag_[% loop.count | html %]" class="highlight" title="Go to detail"><span class="li_pag_index"><i class="fa fa-arrow-left"></i> [% loop.count + offset | html %]</span><a href="opac-detail.pl?biblionumber=[% biblionumber | uri %]&query_desc=[% query_desc |uri %]">[% title | html %]</a><br> [% IF ( author ) %]by [% author | html %][% END %]</li> > [% ELSE %] >- <li id="li_pag_[% loop.count | html %]" title="Go to detail"><span class="li_pag_index">[% loop.count + offset | html %]</span><a href="opac-detail.pl?biblionumber=[% listitem.biblionumber | html %]&query_desc=[% query_desc |uri %]">[% listitem.title | html %]</a><br> [% IF ( listitem.author ) %]by [% listitem.author | html %][% END %]</li> >+ <li id="li_pag_[% loop.count | html %]" title="Go to detail"><span class="li_pag_index">[% loop.count + offset | html %]</span><a href="opac-detail.pl?biblionumber=[% listitem.biblionumber | uri %]&query_desc=[% query_desc |uri %]">[% listitem.title | html %]</a><br> [% IF ( listitem.author ) %]by [% listitem.author | html %][% END %]</li> > [% END %] > [% END %] > </ul> >@@ -1156,7 +1156,7 @@ > [% IF ( LibraryThingForLibrariesID ) %] > <script src="https://ltfl.librarything.com/forlibraries/widget.js?systype=koha&id=[% LibraryThingForLibrariesID | html %]"></script> > <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking >- <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID | html %]&accessibility=1">here</a>.</noscript> >+ <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID | uri %]&accessibility=1">here</a>.</noscript> > [% END %] > > [% IF ( NovelistSelectProfile && ( normalized_isbn || normalized_upc ) ) %] >@@ -1232,7 +1232,7 @@ > <link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut"> > <span class="[% ITEM_RESULT.holding_branch_opac_info ? 'branch-info-tooltip-trigger' : '' %]" title=""> > [% IF ( ITEM_RESULT.branchurl ) %] >- <a href="[% ITEM_RESULT.branchurl | html %]">[% ITEM_RESULT.branchname | html %]</a> >+ <a href="[% ITEM_RESULT.branchurl | uri %]">[% ITEM_RESULT.branchname | html %]</a> > [% ELSE %] > <span>[% ITEM_RESULT.branchname | html %]</span> > [% END %] >@@ -1254,7 +1254,7 @@ > [% IF Branches.GetURL( ITEM_RESULT.homebranch ) %] > [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) | html %] > [% IF ( home_branch_url ) %] >- <a href="[% home_branch_url | html %]">[% Branches.GetName( ITEM_RESULT.homebranch ) | html %]</a> >+ <a href="[% home_branch_url | uri %]">[% Branches.GetName( ITEM_RESULT.homebranch ) | html %]</a> > [% ELSE %] > <span>[% Branches.GetName( ITEM_RESULT.homebranch ) | html %]</span> > [% END %] >@@ -1286,7 +1286,7 @@ > [% IF ( ITEM_RESULT.itemnumber == starting_itemnumber ) %] > (<a class="close_shelf" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber | html %]&shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber | html %]#[% tab | html %]">Browse shelf</a>) > [% ELSE %] >- (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber | html %]&shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber | html %]#[% tab | html %]">Browse shelf</a>) >+ (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber | uri %]&shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber | uri %]#[% tab | uri %]">Browse shelf</a>) > [% END %] > [% END %] > [% END %] >@@ -1316,14 +1316,14 @@ > [% IF Koha.Preference("OPACURLOpenInNewWindow") %] > <a target="_blank" rel="noreferrer" href="/cgi-bin/koha/tracklinks.pl?uri=[% ITEM_RESULT.uri | uri %]&biblionumber=[% biblio.biblionumber | html %]&itemnumber=[% ITEM_RESULT.itemnumber | url %]" property="url"> Link to resource </a> > [% ELSE %] >- <a href="/cgi-bin/koha/tracklinks.pl?uri=[% ITEM_RESULT.uri | uri %]&biblionumber=[% biblio.biblionumber | html %]&itemnumber=[% ITEM_RESULT.itemnumber | url %]" property="url"> Link to resource </a> >+ <a href="/cgi-bin/koha/tracklinks.pl?uri=[% ITEM_RESULT.uri | uri %]&biblionumber=[% biblio.biblionumber | uri %]&itemnumber=[% ITEM_RESULT.itemnumber | url %]" property="url"> Link to resource </a> > [% END %] > > [% ELSE %] > [% IF Koha.Preference("OPACURLOpenInNewWindow") %] > <a target="_blank" rel="noreferrer" href="[% ITEM_RESULT.uri | html %]" property="url">[% ITEM_RESULT.uri | html %]</a> > [% ELSE %] >- <a href="[% ITEM_RESULT.uri | html %]" property="url">[% ITEM_RESULT.uri | html %]</a> >+ <a href="[% ITEM_RESULT.uri | uri %]" property="url">[% ITEM_RESULT.uri | html %]</a> > [% END %] > [% END %] > [% END %] >@@ -1352,7 +1352,7 @@ > [% FOREACH r IN ITEM_RESULT.course_reserves %] > [% IF r.course.enabled == 'yes' %] > <p> >- <a href="opac-course-details.pl?course_id=[% r.course.course_id | html %]"> >+ <a href="opac-course-details.pl?course_id=[% r.course.course_id | uri %]"> > [% r.course.course_name | html %] > <!--[% IF r.course.course_number %] [% r.course.course_number | html %] [% END %]--> > [% IF r.course.section %] [% r.course.section | html %] [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt >index cfeae2591a..02b2ae3be4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt >@@ -66,7 +66,7 @@ > <fieldset class="action"> > <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" /> > <input type="submit" name="save" class="btn" value="Go" /> >- <a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | html %]" class="cancel close" data-dismiss="modal">Cancel</a> >+ <a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel close" data-dismiss="modal">Cancel</a> > </fieldset> > </form> > [% IF ( modal ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt >index b034c8fa4d..b20196c8cd 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt >@@ -16,7 +16,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]">Details for [% bibliotitle | html %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]">Details for [% bibliotitle | html %]</a> <span class="divider">›</span></li> > <li><a href="#">Full subscription history</a></li> > </ul> > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt >index cf38cb7611..bd4ff8257b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt >@@ -37,8 +37,8 @@ > [% FOREACH doc IN role.docs %] > <tr> > <td>[% doc.citation | html %]</td> >- <td><a href="/cgi-bin/koha/opac-search.pl?q=ident:[% doc.ppn | html %]" target="_blank">Koha</a></td> >- <td><a href="http://www.sudoc.fr/[% doc.ppn | html %]" target="_blank" rel="noreferrer">Sudoc</a></td> >+ <td><a href="/cgi-bin/koha/opac-search.pl?q=ident:[% doc.ppn | uri %]" target="_blank">Koha</a></td> >+ <td><a href="http://www.sudoc.fr/[% doc.ppn | uri %]" target="_blank" rel="noreferrer">Sudoc</a></td> > </tr> > [% END %] > </tbody> >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..78312f7c68 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt >@@ -62,7 +62,7 @@ > <p> > [% Koha.Preference('ILLModuleCopyrightClearance') | $raw %] > </p> >- <a href="?method=create&stage=copyrightclearance&backend=[% whole.value.backend | html %]" >+ <a href="?method=create&stage=copyrightclearance&backend=[% whole.value.backend | uri %]" > class="btn btn-sm btn-default"><i class="fa fa-check"></i> Yes</a> > <a href="/cgi-bin/koha/opac-illrequests.pl" > class="btn btn-sm btn-default"><i class="fa fa-times"></i> No</a> >@@ -99,7 +99,7 @@ > </button> > <ul id="backend-dropdown-options" class="dropdown-menu nojs" aria-labelledby="ill-backend-dropdown"> > [% FOREACH backend IN backends %] >- <li><a href="/cgi-bin/koha/opac-illrequests.pl?method=create&backend=[% backend | html %]">[% backend | html %]</a></li> >+ <li><a href="/cgi-bin/koha/opac-illrequests.pl?method=create&backend=[% backend | uri %]">[% backend | html %]</a></li> > [% END %] > </ul> > [% ELSE %] >@@ -140,7 +140,7 @@ > <td><span title="[% request.placed | html %]">[% request.placed | $KohaDates %]</span></td> > <td><span title="[% request.updated | html %]">[% request.updated | $KohaDates %]</span></td> > <td> >- <a href="/cgi-bin/koha/opac-illrequests.pl?method=view&illrequest_id=[% request.id | html %]" class="btn btn-default btn-small pull-right">View</a> >+ <a href="/cgi-bin/koha/opac-illrequests.pl?method=view&illrequest_id=[% request.id | uri %]" class="btn btn-default btn-small pull-right">View</a> > </td> > </tr> > [% END %] >@@ -165,7 +165,7 @@ > [% IF request.biblio_id %] > <li> > <label for="biblio">Requested item:</label> >- <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% request.biblio_id | html %]">Click here to view</a> >+ <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% request.biblio_id | uri %]">Click here to view</a> > </li> > [% END %] > <li> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt >index bc4fe2e4d1..f654048ff8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt >@@ -94,7 +94,7 @@ > <div id="thumbnails"> > [% FOREACH img IN images %] > [% IF img %] >- <a href="/cgi-bin/koha/opac-imageviewer.pl?biblionumber=[% biblionumber | url %]&imagenumber=[% img | html %]" onclick="showCover([% img | html %]); return false;"> >+ <a href="/cgi-bin/koha/opac-imageviewer.pl?biblionumber=[% biblionumber | url %]&imagenumber=[% img | uri %]" onclick="showCover([% img | html %]); return false;"> > [% IF ( imagenumber == img ) %] > <img class="thumbnail selected" id="[% img | html %]" src="/cgi-bin/koha/opac-image.pl?imagenumber=[% img | html %]&thumbnail=1" alt="Thumbnail"/> > [% ELSE %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >index 4d1b1fcf2c..8414737d37 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt >@@ -71,7 +71,7 @@ > </div> > <div id="rssnews-container"> > <!-- Logged in users have a branch code or it could be explicitly set --> >- <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-news-rss.pl?branchcode=[% branchcode | html %]"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png"></a> >+ <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-news-rss.pl?branchcode=[% branchcode | uri %]"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png"></a> > [% IF Branches.all.size == 1 %] > [% IF branchcode %] > RSS feed for [% Branches.GetName( branchcode ) | html %] library news. >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >index abf4fba394..3628f10eeb 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt >@@ -126,7 +126,7 @@ > </fieldset> > [% END %] > [% IF ( extended_unique_id_failed_code ) %] >- <div class="alert" id="extended_unique_id_failed"><a href="#patron-attr-start-[% extended_unique_id_failed_code | html %]">[% extended_unique_id_failed_description _ ': ' | html %]</a> Value is already in use ([% extended_unique_id_failed_value | html %])</div> >+ <div class="alert" id="extended_unique_id_failed"><a href="#patron-attr-start-[% extended_unique_id_failed_code | uri %]">[% extended_unique_id_failed_description _ ': ' | html %]</a> Value is already in use ([% extended_unique_id_failed_value | html %])</div> > [% END %] > > <form method="post" action="/cgi-bin/koha/opac-memberentry.pl" id="memberentry-form" autocomplete="off"> >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..f67fc29db1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >@@ -44,7 +44,7 @@ > [% END %][% END %][% END %] > > [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %] >-[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]<a href="https://[% BakerTaylorBookstoreURL |url %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |url %][% bt_id | html %]" /></a>[% END %][% END %] >+[% IF ( BakerTaylorEnabled ) %][% IF bt_id %]<a href="https://[% BakerTaylorBookstoreURL |url %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |url %][% bt_id | html %]" /></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 %] >@@ -54,7 +54,7 @@ > [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn | html %][% END %] > </p> > [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %] >-<p><a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]">Place Hold on <i>[% SEARCH_RESULT.title | html %]</i></a></p> >+<p><a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Place Hold on <i>[% SEARCH_RESULT.title | html %]</i></a></p> > [% END %] > ]]></description> > <guid>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]</guid> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt >index 521616099d..73eb975eca 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt >@@ -65,7 +65,7 @@ > ("<strong>[% email | html %]</strong>") > [% END %] > <br/>You should have received an email with a link to reset your password. >- <br/>If you did not receive this email, you can request a new one: <a href="/cgi-bin/koha/opac-password-recovery.pl?resendEmail=true&email=[% email | html %]&username=[% username | html %]">Get new password recovery link</a> >+ <br/>If you did not receive this email, you can request a new one: <a href="/cgi-bin/koha/opac-password-recovery.pl?resendEmail=true&email=[% email | uri %]&username=[% username | uri %]">Get new password recovery link</a> > [% ELSIF (errPassNotMatch) %] > The passwords do not match. > [% ELSIF password_too_short %] >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..9f4c0aa177 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >@@ -96,7 +96,7 @@ > <td> > [% IF OPACAmazonCoverImages %] > [% IF issue.normalized_isbn %] >- <a href="http://www.amazon.com/gp/reader/[% issue.normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link"><img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% issue.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="" class="item-thumbnail" /></a> >+ <a href="http://www.amazon.com/gp/reader/[% issue.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link"><img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% issue.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="" class="item-thumbnail" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span> > [% END %] >@@ -113,7 +113,7 @@ > [% IF BakerTaylorEnabled %] > [% bt_id = ( issue.normalized_upc || issue.normalized_isbn ) | html %] > [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span> > [% END %] >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 45733ea8eb..b6c5d6bde4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -43,14 +43,14 @@ > <strong>No results found!</strong> > <p> > [% IF ( searchdesc ) %] >- No results found for that in [% LibraryName | html %] catalog. <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi | html | url %]&format=rss2" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a> >+ No results found for that in [% LibraryName | html %] catalog. <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi | html | url %]&format=rss2" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a> > [% ELSE %] > You did not specify any search criteria. > [% END %] > </p> > [% IF ( ReturnPath ) %] > <div class="returntosearch"> >- <p><a href="[% ReturnPath | html %]">Return to the last advanced search</a></p> >+ <p><a href="[% ReturnPath | uri %]">Return to the last advanced search</a></p> > </div> > [% END %] > [% IF ( OPACNoResultsFound ) %] >@@ -87,7 +87,7 @@ > [% END %] > ). > [% END %] >- <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |html | url %]&count=[% countrss | html %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> >+ <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |html | url %]&count=[% countrss | uri %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> > [% END # / IF total %] > </p> > [% END # / IF searchdesc %] >@@ -104,7 +104,7 @@ > <ul style="list-style: none;"> > [% FOREACH SPELL_SUGGES IN SPELL_SUGGEST %] > <li> >- <a href="/cgi-bin/koha/opac-search.pl?q=[% SPELL_SUGGES.spsuggestion | html %]">[% SPELL_SUGGES.spsuggestion | html %]</a> >+ <a href="/cgi-bin/koha/opac-search.pl?q=[% SPELL_SUGGES.spsuggestion | uri %]">[% SPELL_SUGGES.spsuggestion | html %]</a> > </li> > [% END %] > </ul> >@@ -112,7 +112,7 @@ > [% IF ( total ) %] > [% IF ( ReturnPath ) %] > <div class="returntosearch"> >- <p><a href="[% ReturnPath | html %]">Return to the last advanced search</a></p> >+ <p><a href="[% ReturnPath | uri %]">Return to the last advanced search</a></p> > </div> > [% END %] > [% END %] >@@ -283,7 +283,7 @@ > [% IF ( BakerTaylorEnabled && BakerTaylorBookstoreURL ) %] > [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %] > [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"> >+ <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"> > <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /> > </a> > [% ELSE %] >@@ -294,9 +294,9 @@ > [% IF ( IDreamBooksResults && SEARCH_RESULT.normalized_isbn ) %] > <div class="idbresult" style="display: none;"> > [% IF ( IDreamBooksReviews ) %] >- <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]#idb_critic_reviews"> >+ <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]#idb_critic_reviews"> > [% ELSE %] >- <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]"> >+ <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]"> > [% END %] > [% SEARCH_RESULT.normalized_isbn | html %]</a> > </div> >@@ -462,7 +462,7 @@ > <span class="label">Lists:</span> > <ul> > [% FOREACH shelf IN SEARCH_RESULT.shelves %] >- <li><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | html %]">[% shelf.shelfname | html %]</a></li> >+ <li><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]">[% shelf.shelfname | html %]</a></li> > [%~ UNLESS loop.last %], [% ELSE %].[% END ~%] > [% END %] > </ul> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt >index a51642c255..abdabdccff 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt >@@ -48,7 +48,7 @@ > [% FOREACH routinglist IN routinglists %] > [% IF ( titles_loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %] > <td> >- <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% routinglist.subscription.biblio.biblionumber | html %]"> >+ <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% routinglist.subscription.biblio.biblionumber | uri %]"> > [% routinglist.subscription.biblio.title | html %] > </a> > </td> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >index 284955359d..063da8d974 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >@@ -71,7 +71,7 @@ > <tr> > <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td> > <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td> >- <td><a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&[% s.query_cgi | html %]&count=[% countrss | html %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td> >+ <td><a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&[% s.query_cgi | uri %]&count=[% countrss | uri %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td> > <td>[% s.total | html %]</td> > </tr> > [% END %] >@@ -111,7 +111,7 @@ > <tr> > <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td> > <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td> >- <td><a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&[% s.query_cgi | html %]&count=[% countrss | html %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td> >+ <td><a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&[% s.query_cgi | uri %]&count=[% countrss | uri %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> <a href="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td> > <td>[% s.total | html %]</td> > </tr> > [% END %] >@@ -156,7 +156,7 @@ > <tr> > <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td> > <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td> >- <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td> >+ <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td> > <td>[% s.total | html %]</td> > </tr> > [% END %] >@@ -193,7 +193,7 @@ > <tr> > <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td> > <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td> >- <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td> >+ <td><a href="/cgi-bin/koha/opac-authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td> > <td>[% s.total | html %]</td> > </tr> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >index da453bc430..9733a327b8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt >@@ -10,7 +10,7 @@ > <div class="main"> > <ul class="breadcrumb"> > <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li> >- <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]">Details for [% bibliotitle | html %]</a> <span class="divider">›</span></li> >+ <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]">Details for [% bibliotitle | html %]</a> <span class="divider">›</span></li> > <li><a href="#">Issues for a subscription</a></li> > </ul> > >@@ -137,11 +137,11 @@ > [% IF ( subscription_LOO.letter ) %] > [% IF ( loggedinusername ) %] > [% IF ( subscription_LOO.hasalert ) %] >- You have subscribed to email notification on new issues <a href="opac-alert-subscribe.pl?op=cancel&subscriptionid=[% subscription_LOO.subscriptionid | html %]&referer=serial&biblionumber=[% subscription_LOO.biblionumber | html %]" class="btn" title="Cancel email notification"> >+ You have subscribed to email notification on new issues <a href="opac-alert-subscribe.pl?op=cancel&subscriptionid=[% subscription_LOO.subscriptionid | uri %]&referer=serial&biblionumber=[% subscription_LOO.biblionumber | uri %]" class="btn" title="Cancel email notification"> > Cancel email notification > </a> > [% ELSE %] >- <a href="opac-alert-subscribe.pl?subscriptionid=[% subscription_LOO.subscriptionid | html %]&referer=serial&biblionumber=[% subscription_LOO.biblionumber | html %]" class="btn" title="Subscribe to email notification on new issues"> >+ <a href="opac-alert-subscribe.pl?subscriptionid=[% subscription_LOO.subscriptionid | uri %]&referer=serial&biblionumber=[% subscription_LOO.biblionumber | uri %]" class="btn" title="Subscribe to email notification on new issues"> > Subscribe to email notification on new issues > </a> > [% END %] >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..e4d1177490 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >@@ -48,13 +48,13 @@ > > [% IF shelf and shelf.is_private %] > [% IF op == 'view' OR op == 'edit_form' %] >- <li><span class="divider">›</span> <a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=[% PRIVATE | html %]">Your lists</a></li> >+ <li><span class="divider">›</span> <a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=[% PRIVATE | uri %]">Your lists</a></li> > [% ELSE %] > <li><span class="divider">›</span> Your lists</li> > [% END %] > [% ELSIF shelf AND shelf.is_public %] > [% IF op == 'view' %] >- <li><span class="divider">›</span> <a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=[% PUBLIC | html %]">Public lists</a></li> >+ <li><span class="divider">›</span> <a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=[% PUBLIC | uri %]">Public lists</a></li> > [% ELSE %] > <li><span class="divider">›</span> Public lists</li> > [% END %] >@@ -151,7 +151,7 @@ > [% IF shelf AND op == 'view' %] > <h3> > [% shelf.shelfname | html %] >- <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-shelves.pl?rss=1&op=view&shelfnumber=[% shelf.shelfnumber | html %]" class="rss-list-link noprint"> >+ <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-shelves.pl?rss=1&op=view&shelfnumber=[% shelf.shelfnumber | uri %]" class="rss-list-link noprint"> > <img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this list" title="Subscribe to this list" border="0" class="rsssearchicon"/> > </a> > </h3> >@@ -160,10 +160,10 @@ > <div id="toolbar" class="toolbar clearfix"> > <div class="list-actions"> > <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?op=add_form">New list</a> <span class="sep">|</span> >- <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfnumber=[% shelf.shelfnumber | html %]" class="download" data-toggle="modal" data-target="#modalWin">Download list</a> >+ <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfnumber=[% shelf.shelfnumber | uri %]" class="download" data-toggle="modal" data-target="#modalWin">Download list</a> > > [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] >- <span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelf.shelfnumber | html %]" class="send" onclick="open('/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelf.shelfnumber | html %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send list</a></span> >+ <span class="sendlist"><a href="/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelf.shelfnumber | uri %]" class="send" onclick="open('/cgi-bin/koha/opac-sendshelf.pl?shelfid=[% shelf.shelfnumber | html %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100'); return false; ">Send list</a></span> > [% END %] > > <a class="print-small" target="_blank" href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | html %]&sortfield=[% sortfield | html %]&direction=[% direction |uri %]&print=1">Print list</a> >@@ -186,7 +186,7 @@ > <input type="submit" class="deleteshelf" value="Delete list" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST);"/> > </form> > [% IF category == PRIVATE && Koha.Preference('OpacAllowSharingPrivateLists') %] >- <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% shelf.shelfnumber | html %]" class="sharelist">Share list</a> >+ <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% shelf.shelfnumber | uri %]" class="sharelist">Share list</a> > [% END %] > [% ELSIF category == PRIVATE # not manageshelf and private means shared %] > <form action="/cgi-bin/koha/opac-shelves.pl" method="post" class="form-inline"> >@@ -349,7 +349,7 @@ > [% IF ( BakerTaylorEnabled ) %] > [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) | html %] > [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span> > [% END %] >@@ -623,9 +623,9 @@ > <fieldset class="action"> > <input type="submit" value="Save" class="btn" /> > [% IF referer == 'view' %] >- <a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | html %]" class="cancel">Cancel</a> >+ <a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a> > [% ELSE %] >- <a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=[% PRIVATE | html %]" class="cancel">Cancel</a> >+ <a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=[% PRIVATE | uri %]" class="cancel">Cancel</a> > [% END %] > > </fieldset> >@@ -677,7 +677,7 @@ > [% FOREACH s IN shelves %] > [% SET contents = s.get_contents %] > <tr> >- <td><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber | html %]">[% s.shelfname | html %]</a></td> >+ <td><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber | uri %]">[% s.shelfname | html %]</a></td> > <td>[% IF contents.count %][% contents.count | html %] [% IF contents.count == 1 %]item[% ELSE %]items[% END %][% ELSE %]Empty[% END %]</td> > <td> > [% IF s.is_private %] >@@ -706,7 +706,7 @@ > </form> > [% END %] > [% IF s.is_private AND s.can_be_managed( loggedinusernumber ) AND Koha.Preference('OpacAllowSharingPrivateLists') %] >- <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% s.shelfnumber | html %]" class="sharelist">Share</a> >+ <a href="/cgi-bin/koha/opac-shareshelf.pl?op=invite&shelfnumber=[% s.shelfnumber | uri %]" class="sharelist">Share</a> > [% END %] > [% IF s.is_shared_with( loggedinusernumber ) %] > <form action="opac-shelves.pl" method="post" class="form-inline"> >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..96ebb10fb9 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 >@@ -17,7 +17,7 @@ > [% END %][% END %][% END %] > > [% bt_id = ( review.normalized_upc || review.normalized_isbn ) | html %] >-[% IF ( BakerTaylorEnabled && bt_id ) %]<a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>[% END %] >+[% IF ( BakerTaylorEnabled && bt_id ) %]<a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>[% END %] > [% IF ( review.author ) %]<p>By [% review.author | html %].</p> [% END %] > <p>[% IF ( review.place ) %][% review.place | html %] [% END %][% IF ( review.publishercode ) %][% review.publishercode | html %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear | html %] > [% ELSE %][% IF ( review.copyrightdate ) %] [% review.copyrightdate | html %][% END %][% END %] >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..e7d2ee244b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >@@ -29,7 +29,7 @@ > <div class="span12"> > [% END %] > <div id="showreviews" class="searchresults maincontent"> >- <h3>Recent comments <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-showreviews.pl?format=rss" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to recent comments" title="Subscribe to recent comments" border="0" class="rsssearchicon"/></a></h3> >+ <h3>Recent comments <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-showreviews.pl?format=rss" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to recent comments" title="Subscribe to recent comments" border="0" class="rsssearchicon"/></a></h3> > <table class="table table-striped"> > [% FOREACH review IN reviews %] > <tr> >@@ -140,7 +140,7 @@ > [% bt_id = ( review.normalized_upc || review.normalized_isbn ) | html %] > [% IF ( BakerTaylorEnabled ) %] > [% IF ( bt_id ) %] >- <a href="https://[% review.BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% review.BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ <a href="https://[% review.BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% review.BakerTaylorImageURL | html %][% bt_id | html %]" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt >index d1cb6f6e63..d28db08d1f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt >@@ -41,7 +41,7 @@ > </fieldset> > > [% FOREACH LOO IN LOOP %] >- <a href="/cgi-bin/koha/opac-search.pl?idx=su&q="[% LOO.entry | html %]"" style="font-size:[% LOO.weight | html %]px;">[% LOO.entry | html %]</a> >+ <a href="/cgi-bin/koha/opac-search.pl?idx=su&q="[% LOO.entry | uri %]"" style="font-size:[% LOO.weight | html %]px;">[% LOO.entry | html %]</a> > [% END %] > [% ELSE %] > <p>Note: This feature only available to French catalogs where ISBD subjects have been populated, and an index built by separate script.</p> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >index 2d2bee696b..4c08a4a58b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >@@ -80,7 +80,7 @@ > [% END %] > </td> > <td><span class="tdlabel">Checkouts: </span> <span title="[% result.count | html %]">[% result.count | html %]</span></td> >- [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]<td>[% IF Koha.Preference( 'RequestOnOpac' ) == 1 %][% UNLESS ( result.norequests ) %]<a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% result.biblionumber | html %]">Place hold</a>[% END %][% END %]</td>[% END %] >+ [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]<td>[% IF Koha.Preference( 'RequestOnOpac' ) == 1 %][% UNLESS ( result.norequests ) %]<a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=[% result.biblionumber | uri %]">Place hold</a>[% END %][% END %]</td>[% END %] > </tr> > [% END %] > </tbody> >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..4156685192 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -213,7 +213,7 @@ > > [% IF ( OPACAmazonCoverImages ) %] > [% IF ( ISSUE.normalized_isbn ) %] >- <a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail"/></a> >+ <a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail"/></a> > [% ELSE %] > <a href="#"><span class="no-image">No cover image available</span></a> > [% END %] >@@ -230,7 +230,7 @@ > [% IF ( BakerTaylorEnabled ) %] > [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) | html %] > [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_upc or normalized_isbn! --> > [% END %] >@@ -286,7 +286,7 @@ > [% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %] > [% IF ( ISSUE.status ) %] > [% IF ( canrenew ) %] >- <input type="checkbox" name="item" value="[% ISSUE.itemnumber | html %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=[% ISSUE.itemnumber | html %]&borrowernumber=[% ISSUE.borrowernumber | html %]">Renew</a> >+ <input type="checkbox" name="item" value="[% ISSUE.itemnumber | uri %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=[% ISSUE.itemnumber | uri %]&borrowernumber=[% ISSUE.borrowernumber | uri %]">Renew</a> > [% END %] > [% IF ISSUE.renewalfee > 0 %] > <span class="renewalfee">Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price %]</span> >@@ -432,7 +432,7 @@ > [% FOREACH i IN r.issues %] > <tr> > <td> >- <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber | html %]"> >+ <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber | uri %]"> > [% i.item.biblio.title | html %][% IF ( i.item.enumchron ) %] [% i.item.enumchron | html %][% END %] > </a> > </td> >@@ -488,7 +488,7 @@ > <td class="jacketcell"> > [% IF ( OPACAmazonCoverImages ) %] > [% IF ( OVERDUE.normalized_isbn ) %] >- <a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn | html %][% AmazonAssocTag | html %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% OVERDUE.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail" /></a> >+ <a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link" title="View on Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% OVERDUE.normalized_isbn | html %].01.THUMBZZZ.jpg" alt="View on Amazon.com" class="item-thumbnail" /></a> > [% ELSE %] > <a href="#"><span class="no-image">No cover image available</span></a> > [% END %] >@@ -505,7 +505,7 @@ > [% IF ( BakerTaylorEnabled ) %] > [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) | html %] > [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL | html %][% bt_id | html %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_upc or normalized_isbn! --> > [% END %] >@@ -551,7 +551,7 @@ > Account frozen > [% ELSIF ( OVERDUE.status ) %] > [% IF ( canrenew ) %] >- <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=[% OVERDUE.itemnumber | html %]&bornum=[% OVERDUE.borrowernumber | html %]">Renew</a> >+ <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=[% OVERDUE.itemnumber | uri %]&bornum=[% OVERDUE.borrowernumber | uri %]">Renew</a> > [% END %] > <span class="renewals">([% OVERDUE.renewsleft | html %] of [% OVERDUE.renewsallowed | html %] renewals remaining)</span> > [% ELSIF ( OVERDUE.norenew_overdue ) %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >index 018374418d..70a9f0af39 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >@@ -239,7 +239,7 @@ > <td>[% ISSUE.issuedate | html %]</td> > <td> > [% UNLESS ( noitemlinks ) %] >- <a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE. biblionumber | html %]">[% ISSUE.title | html %]</a> >+ <a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE. biblionumber | uri %]">[% ISSUE.title | html %]</a> > [% ELSE %] > <strong>[% ISSUE.title | html %]</strong> > [% END %] >diff --git a/misc/cronjobs/rss/lastAcquired-1.0.tt b/misc/cronjobs/rss/lastAcquired-1.0.tt >index 0f1a5e2d37..3059e91606 100644 >--- a/misc/cronjobs/rss/lastAcquired-1.0.tt >+++ b/misc/cronjobs/rss/lastAcquired-1.0.tt >@@ -32,7 +32,7 @@ > <br>[% place | html %] [% i.publishercode | html %] [% i.publicationyear | html %] > <br>[% pages | html %] [% i.illus | html %] [% i.size | html %] > [% IF i.notes %]<br><br>[% i.notes | html %][% END %]<br> >-<a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber | html %]">View Details</a> | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber | html %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=[% i.author | html %]&resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author</a>[% END %] >+<a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber | uri %]">View Details</a> | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber | html %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=[% i.author | html %]&resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author</a>[% END %] > ]]></description> > </item> > [% END %] >diff --git a/misc/cronjobs/rss/lastAcquired-2.0.tt b/misc/cronjobs/rss/lastAcquired-2.0.tt >index 5067fa4c99..89ca3a5ecf 100644 >--- a/misc/cronjobs/rss/lastAcquired-2.0.tt >+++ b/misc/cronjobs/rss/lastAcquired-2.0.tt >@@ -25,7 +25,7 @@ > <br>[% IF i.publishercode %][% i.place | html %] [% i.publishercode | html %] [% publicationyear | html %]<br>[% END %] > [% IF i.pages %][% i.pages | html %][% i.illus | html %][% i.size | html %][% END %] > [% IF i.notes %]<p>[% i.notes | html %]</p>[% END %]<br> >-<a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber | html %]">View Details</a> | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber | html %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=[% i.author | html %]&resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author</a>[% END %] >+<a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber | uri %]">View Details</a> | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber | html %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&and_or=and&excluding=&operator=contains&value=[% i.author | html %]&resultsperpage=20&orderby=biblio.title&op=do_search">More by this Author</a>[% END %] > ]]></description> > </item> > [% END %] >-- >2.19.1
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=81058">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21526
:
80337
|
80641
|
80649
|
80661
|
80725
|
80755
|
80756
|
81058
|
81059
|
81300
|
81301
|
81302
|
81337
|
81530
|
81763
|
81764
|
82011
|
82012
|
82013
|
82140
|
82141
|
82142
|
82600