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>
245 lines
12 KiB
Text
245 lines
12 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Tools › Quote editor</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% Asset.css("css/quotes.css") | $raw %]
|
|
[% Asset.css("css/datatables.css") | $raw %]
|
|
</head>
|
|
|
|
<body id="tools_quotes" class="tools">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'cat-search.inc' %]
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › Quote editor</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
[% INCLUDE 'quotes-toolbar.inc' %]
|
|
<h2>Quote editor</h2>
|
|
<div id="instructions">
|
|
<fieldset id="quote_editor_help" class="rows">
|
|
<legend>Instructions</legend>
|
|
<div id="quote_editor_inst">
|
|
<ul>
|
|
<li>Click on the 'Add quote' button to add a single quote; Press the <Enter> key to save the quote.<br />
|
|
<b>Note: </b>Both the 'source' and 'text' fields must have content in order for the quote to be saved.</li>
|
|
<li>Click on any field to edit the contents; Press the <Enter> key to save edit.</li>
|
|
<li>Click on one or more quote numbers to select entire quotes for deletion; Click the 'Delete quote(s)' button to delete selected quotes.</li>
|
|
<li>Click the 'Import quotes' button in the toolbar to import a CSV file of quotes.</li>
|
|
</ul>
|
|
</div>
|
|
</fieldset>
|
|
</div>
|
|
<table id="quotes_editor">
|
|
<thead>
|
|
<tr>
|
|
<th><span style="cursor: help" id="id_help">ID</span></th>
|
|
<th>Source</th>
|
|
<th>Text</th>
|
|
<th>Last displayed</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
<!-- tbody content is generated by DataTables -->
|
|
<tr>
|
|
<td></td>
|
|
<td></td>
|
|
<td>Loading data...</td>
|
|
<td></td>
|
|
</tr>
|
|
</tbody>
|
|
</table>
|
|
<fieldset id="footer" class="action">
|
|
</fieldset>
|
|
</div>
|
|
</div>
|
|
<div class="yui-b noprint">
|
|
[% INCLUDE 'tools-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% Asset.js("js/tools-menu.js") | $raw %]
|
|
[% INCLUDE 'datatables.inc' %]
|
|
[% Asset.js("lib/jquery/plugins/dataTables.fnReloadAjax.js") | $raw %]
|
|
[% Asset.js("lib/jquery/plugins/jquery.jeditable.mini.js") | $raw %]
|
|
<script type="text/javascript">
|
|
var oTable; /* oTable needs to be global */
|
|
var sEmptyTable = _("No quotes available. Please use the 'Add quote' button to add a quote."); /* override the default message in datatables.inc */
|
|
$(document).ready(function() {
|
|
/* NOTE: This is an ajax-source datatable and *not* a server-side sourced datatable. */
|
|
/* See the datatable docs if you don't understand this difference. */
|
|
oTable = $("#quotes_editor").dataTable({
|
|
"bAutoWidth" : false,
|
|
"bProcessing" : true,
|
|
"bPaginate" : true,
|
|
"sPaginationType" : "full_numbers",
|
|
"sDom": '<"top pager"iflp>rt<"bottom pager"flp><"clear">',
|
|
"sAjaxSource" : "/cgi-bin/koha/tools/quotes/quotes_ajax.pl",
|
|
"aoColumns" : [
|
|
{ "sWidth": "3%" },
|
|
{ "sWidth": "11%" },
|
|
{ "sWidth": "75%" },
|
|
{ "sWidth": "11%" },
|
|
],
|
|
"oLanguage" : {
|
|
"oPaginate": {
|
|
"sFirst": MSG_DT_FIRST,
|
|
"sLast": MSG_DT_LAST,
|
|
"sNext": MSG_DT_NEXT,
|
|
"sPrevious": MSG_DT_PREVIOUS,
|
|
},
|
|
"sEmptyTable": MSG_DT_EMPTY_TABLE,
|
|
"sInfo": MSG_DT_INFO,
|
|
"sInfoEmpty": MSG_DT_INFO_EMPTY,
|
|
"sInfoFiltered": MSG_DT_INFO_FILTERED,
|
|
"sLengthMenu": MSG_DT_LENGTH_MENU,
|
|
"sLoadingRecords": MSG_DT_LOADING_RECORDS,
|
|
"sProcessing": MSG_DT_PROCESSING,
|
|
"sSearch": MSG_DT_SEARCH,
|
|
"sZeroRecords": MSG_DT_ZERO_RECORDS,
|
|
},
|
|
"fnPreDrawCallback": function(oSettings) {
|
|
return true;
|
|
},
|
|
"fnRowCallback": function( nRow, aData, iDisplayIndex ) {
|
|
/* do foo on the current row and its child nodes */
|
|
var noEditFields = [];
|
|
var quoteID = $('td', nRow)[0].innerHTML;
|
|
$(nRow).attr("id", quoteID); /* set row ids to quote id */
|
|
$('td:eq(0)', nRow).click(function() {$(this.parentNode).toggleClass('selected',this.clicked);}); /* add row selectors */
|
|
$('td:eq(0)', nRow).attr("title", _("Click ID to select/deselect quote"));
|
|
$('td', nRow).attr("id",quoteID); /* FIXME: this is a bit of a hack */
|
|
if (isNaN(quoteID)) {
|
|
noEditFields = [0,1,2,3]; /* all fields when adding a quote */
|
|
} else {
|
|
noEditFields = [0,3]; /* id, timestamp */
|
|
}
|
|
/* apply no_edit id to noEditFields */
|
|
for (i=0; i<noEditFields.length; i++) {
|
|
$('td', nRow)[noEditFields[i]].setAttribute("id","no_edit");
|
|
}
|
|
return nRow;
|
|
},
|
|
"fnDrawCallback": function(oSettings) {
|
|
/* Apply the jEditable handlers to the table on all fields w/o the no_edit id */
|
|
$('#quotes_editor tbody td[id!="no_edit"]').editable( "/cgi-bin/koha/tools/quotes/quotes_ajax.pl", {
|
|
"submitdata" : function ( value, settings ) {
|
|
return {
|
|
"column" : oTable.fnGetPosition( this )[2],
|
|
"action" : "edit",
|
|
};
|
|
},
|
|
"height" : "14px",
|
|
"placeholder" : "Saving data...",
|
|
});
|
|
},
|
|
});
|
|
$("#add_quote").click(function(){
|
|
fnClickAddRow();
|
|
return false;
|
|
});
|
|
$("#delete_quote").click(function(){
|
|
fnClickDeleteRow();
|
|
return false;
|
|
});
|
|
$("#id_help").on("click",function(e){
|
|
e.stopPropagation();
|
|
alert( _("Click on the quote's id to select or deselect the quote. Multiple quotes may be selected.") );
|
|
});
|
|
});
|
|
|
|
function fnClickAddQuote(e, node) {
|
|
if (e.charCode) {
|
|
/* some browsers only give charCode, so this will need to be */
|
|
/* fixed up to handle that */
|
|
console.log('charCode: '+e.charCode);
|
|
}
|
|
if (e.keyCode == 13) {
|
|
var quoteSource = $('#quoteSource').val();
|
|
var quoteText = $('#quoteText').val()
|
|
/* If passed a quote source, add the quote to the db */
|
|
if (quoteSource && quoteText) {
|
|
$.ajax({
|
|
url: "/cgi-bin/koha/tools/quotes/quotes_ajax.pl",
|
|
type: "POST",
|
|
data: {
|
|
"source" : quoteSource,
|
|
"text" : quoteText,
|
|
"action" : "add",
|
|
},
|
|
success: function(data){
|
|
var newQuote = data[0];
|
|
var aRow = oTable.fnUpdate(
|
|
newQuote,
|
|
node,
|
|
undefined,
|
|
false,
|
|
false
|
|
);
|
|
oTable.fnPageChange( 'last' );
|
|
$('.add_quote_button').attr('onclick', 'fnClickAddRow()'); // re-enable add button
|
|
}
|
|
});
|
|
} else {
|
|
alert(_("Please supply both the text and source of the quote before saving."));
|
|
}
|
|
} else if (e.keyCode == 27) {
|
|
if (confirm(_("Are you sure you want to cancel adding this quote?"))) {
|
|
oTable.fnDeleteRow(node);
|
|
} else {
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
function fnClickAddRow() {
|
|
$('.add_quote_button').removeAttr('onclick'); // disable add button once it has been clicked
|
|
var aRow = oTable.fnAddData(
|
|
[
|
|
'NA', // this is hackish to fool the datatable sort routine into placing this row at the end of the list...
|
|
'<input id="quoteSource" type="text" style="height:14px; width:99%" onkeydown="fnClickAddQuote(event,this.parentNode.parentNode)"/>',
|
|
'<input id="quoteText" type="text" style="height:14px; width:99%" onkeydown="fnClickAddQuote(event,this.parentNode.parentNode)"/>',
|
|
'0000-00-00 00:00:00',
|
|
],
|
|
false
|
|
);
|
|
oTable.fnPageChange( 'last' );
|
|
$('#quoteSource').focus();
|
|
}
|
|
|
|
function fnClickDeleteRow() {
|
|
var idsToDelete = oTable.$('.selected').map(function() {
|
|
return this.id;
|
|
}).get().join(', ');
|
|
if (!idsToDelete) {
|
|
alert(_("Please select a quote(s) by clicking the quote id(s) you desire to delete."));
|
|
} else if (confirm(_("Are you sure you wish to delete quote(s) %s?").format(idsToDelete))) {
|
|
oTable.$('.selected').each(function(){
|
|
var quoteID = $(this).attr('id');
|
|
$.ajax({
|
|
url: "/cgi-bin/koha/tools/quotes/quotes_ajax.pl",
|
|
type: "POST",
|
|
data: {
|
|
"id" : quoteID,
|
|
"action" : "delete",
|
|
},
|
|
/* Delete the row from the datatable */
|
|
success: function(){
|
|
oTable.fnDeleteRow(this);
|
|
oTable.fnReloadAjax(null, null, true);
|
|
}
|
|
});
|
|
});
|
|
} else {
|
|
return;
|
|
}
|
|
}
|
|
</script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|