dcd1f5d48c
Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain <script> tags - Remove them from borrower_debarments.comments (there are allowed here) update borrower_debarments set comment="html tags possible here"; - From the interface hit page and try to catch alert box. If you find one it means you find a possible XSS. To know where it comes from: * note the exact URL where you found it * note the alert box content * Dump your DB and search for the string in the dump to identify its location (for instance table.field) Next: * Ideally we would like to use the raw filter when it is not necessary to HTML escape the variables (in big loop for instance) * Provide a QA script to catch missing filters (we want html, uri, url or raw, certainly others that I am forgetting now) * Replace the html filters with uri when needed (!) Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
285 lines
17 KiB
Text
285 lines
17 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE Koha %]
|
|
[% USE KohaDates %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your search history</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
[% INCLUDE 'bodytag.inc' bodyid='opac-search-history' bodyclass='scrollto' %]
|
|
[% INCLUDE 'masthead.inc' %]
|
|
|
|
<div class="main">
|
|
<ul class="breadcrumb">
|
|
<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li>
|
|
[% IF ( loggedinusername ) %]
|
|
<li><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a> <span class="divider">›</span></li>
|
|
<li><a href="#">Your search history</a></li>
|
|
[% ELSE %]
|
|
<li><a href="#">Search history</a></li>
|
|
[% END %]
|
|
</ul>
|
|
|
|
<div class="container-fluid">
|
|
<div class="row-fluid">
|
|
[% IF ( OpacNav||loggedinusername ) %]
|
|
<div class="span2">
|
|
<div id="navigation">
|
|
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
|
|
</div>
|
|
</div>
|
|
<div class="span10">
|
|
[% ELSE %]
|
|
<div class="span12">
|
|
[% END %]
|
|
<div id="searchhistory" class="maincontent">
|
|
<h1>Search history</h1>
|
|
[% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]
|
|
<div id="tabs" class="toptabs">
|
|
<ul>
|
|
<li><a href="#biblio_tab">Catalog</a></li>
|
|
<li><a href="#authority_tab">Authority</a></li>
|
|
</ul>
|
|
[% END %]
|
|
<div id="biblio_tab">
|
|
<div id="current_biblio">
|
|
[% IF ( current_biblio_searches ) %]
|
|
<h2>Current session</h2>
|
|
<form action="/cgi-bin/koha/opac-search-history.pl" method="post">
|
|
<div class="selections-toolbar toolbar">
|
|
<a class="CheckAll" href="#">Select all</a>
|
|
<a class="CheckNone" href="#">Clear all</a>
|
|
<span class="sep">|</span>
|
|
<span class="links">
|
|
<span class="selections">Select searches to: </span>
|
|
<a href="#" class="removeitems disabled">Delete</a>
|
|
</span>
|
|
</div>
|
|
<input type="hidden" name="action" value="delete" />
|
|
<table class="historyt table table-bordered table-striped">
|
|
<thead>
|
|
<tr>
|
|
<th></th>
|
|
<th>Date</th>
|
|
<th>Search</th>
|
|
<th>Results</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH s IN current_biblio_searches %]
|
|
<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>[% s.total | html %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
<input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
|
|
</form>
|
|
[% END # IF ( current_biblio_searches ) %]
|
|
</div> <!-- / #current_biblio -->
|
|
|
|
<div id="previous_biblio">
|
|
[% IF ( previous_biblio_searches ) %]
|
|
<h2>Previous sessions</h2>
|
|
<form action="/cgi-bin/koha/opac-search-history.pl" method="post">
|
|
<div class="selections-toolbar toolbar">
|
|
<a class="CheckAll" href="#">Select all</a>
|
|
<a class="CheckNone" href="#">Clear all</a>
|
|
<span class="sep">|</span>
|
|
<span class="links">
|
|
<span class="selections">Select searches to: </span>
|
|
<a href="#" class="removeitems disabled">Delete</a>
|
|
</span>
|
|
</div>
|
|
|
|
<input type="hidden" name="action" value="delete" />
|
|
<table class="historyt table table-bordered table-striped">
|
|
<thead>
|
|
<tr>
|
|
<th></th>
|
|
<th>Date</th>
|
|
<th>Search</th>
|
|
<th>Results</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH s IN previous_biblio_searches %]
|
|
<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>[% s.total | html %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
<input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
|
|
</form>
|
|
[% END # IF ( previous_biblio_searches ) %]
|
|
</div> <!-- / #previous_biblio -->
|
|
|
|
[% IF !current_biblio_searches && !previous_biblio_searches %]
|
|
<p>Your catalog search history is empty.</p>
|
|
[% END %]
|
|
</div> <!-- / #biblio_tab -->
|
|
|
|
[% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]
|
|
<div id="authority_tab">
|
|
[% IF ( current_authority_searches ) %]
|
|
<h2>Current session</h2>
|
|
<form action="/cgi-bin/koha/opac-search-history.pl" method="post">
|
|
<div class="selections-toolbar toolbar">
|
|
<a class="CheckAll" href="#">Select all</a>
|
|
<a class="CheckNone" href="#">Clear all</a>
|
|
<span class="sep">|</span>
|
|
<span class="links">
|
|
<span class="selections">Select searches to: </span>
|
|
<a href="#" class="removeitems disabled">Delete</a>
|
|
</span>
|
|
</div>
|
|
<input type="hidden" name="action" value="delete" />
|
|
<table class="historyt table table-bordered table-striped">
|
|
<thead>
|
|
<tr>
|
|
<th></th>
|
|
<th>Date</th>
|
|
<th>Search</th>
|
|
<th>Results</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH s IN current_authority_searches %]
|
|
<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>[% s.total | html %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
<input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
|
|
</form>
|
|
[% END # / IF ( current_authority_searches ) %]
|
|
|
|
[% IF ( previous_authority_searches ) %]
|
|
<h2>Previous sessions</h2>
|
|
<form action="/cgi-bin/koha/opac-search-history.pl" method="post">
|
|
<div class="selections-toolbar toolbar">
|
|
<a class="CheckAll" href="#">Select all</a>
|
|
<a class="CheckNone" href="#">Clear all</a>
|
|
<span class="sep">|</span>
|
|
<span class="links">
|
|
<span class="selections">Select searches to: </span>
|
|
<a href="#" class="removeitems disabled">Delete</a>
|
|
</span>
|
|
</div>
|
|
<input type="hidden" name="action" value="delete" />
|
|
<table class="historyt table table-bordered table-striped">
|
|
<thead>
|
|
<tr>
|
|
<th></th>
|
|
<th>Date</th>
|
|
<th>Search</th>
|
|
<th>Results</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH s IN previous_authority_searches %]
|
|
<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>[% s.total | html %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
<input type="submit" class="btn btn-danger remove-selected" value="Remove selected searches">
|
|
</form>
|
|
[% END # / IF ( previous_authority_searches )%]
|
|
|
|
[% IF !current_authority_searches && !previous_authority_searches %]
|
|
<p>Your authority search history is empty.</p>
|
|
[% END %]
|
|
</div> <!-- / #authority_tab -->
|
|
[% END # / IF Koha.Preference( 'OpacAuthorities' ) %]
|
|
</div> <!-- / #tabs -->
|
|
</div> <!-- / #searchhistory -->
|
|
</div> <!-- / .span10/12 -->
|
|
</div> <!-- / .row-fluid -->
|
|
</div> <!-- / .container-fluid -->
|
|
</div> <!-- / #main -->
|
|
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
[% BLOCK jsinclude %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
[% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
|
|
<script>
|
|
//<![CDATA[
|
|
var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete selected search history entries?");
|
|
$(document).ready(function() {
|
|
// We show table ordered by descending dates by default
|
|
// (so that the more recent query is shown first)
|
|
$(".historyt").dataTable($.extend(true, {}, dataTablesDefaults, {
|
|
"order": [[ 1, "desc" ]],
|
|
"columnDefs": [
|
|
{ "targets": [ 0 ], "sortable": false, "searchable": false },
|
|
{ "targets": [ 1 ], "type": "title-string" },
|
|
]
|
|
}));
|
|
|
|
[% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]$('#tabs').tabs();[% END %]
|
|
|
|
$(".CheckNone").click(function(e){
|
|
e.preventDefault();
|
|
var form = $(this).parents("form").get(0);
|
|
$(form).unCheckCheckboxes();
|
|
enableCheckboxActions(form);
|
|
});
|
|
$(".CheckAll").click(function(e){
|
|
e.preventDefault();
|
|
var form = $(this).parents("form").get(0);
|
|
$(form).checkCheckboxes();
|
|
enableCheckboxActions(form);
|
|
});
|
|
|
|
$("input:checkbox").click(function(){
|
|
var form = $(this).parents("form").get(0);
|
|
enableCheckboxActions(form);
|
|
});
|
|
|
|
$(".removeitems,.remove-selected").click(function(e){
|
|
e.preventDefault();
|
|
var form = $(this).parents("form").get(0);
|
|
var ids = $(form).find("input:checkbox:checked");
|
|
if ( $(ids).length < 1 ) {
|
|
return false;
|
|
}
|
|
if ( confirm(MSG_CONFIRM_DELETE_HISTORY) ) {
|
|
$(form).submit();
|
|
}
|
|
return false;
|
|
});
|
|
});
|
|
|
|
function enableCheckboxActions(form){
|
|
// Enable/disable controls if checkboxes are checked
|
|
var checkedBoxes = $(form).find("input:checkbox:checked");
|
|
if ($(checkedBoxes).size()) {
|
|
$(form).find(".selections").html(_("With selected searches: "));
|
|
$(form).find(".selections-toolbar .links a").removeClass("disabled");
|
|
} else {
|
|
$(form).find(".selections").html(_("Select searches to: "));
|
|
$(form).find(".selections-toolbar .links a").addClass("disabled");
|
|
}
|
|
}
|
|
|
|
//]]>
|
|
|
|
</script>
|
|
[% END %]
|