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>
345 lines
13 KiB
Text
345 lines
13 KiB
Text
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Reports [% IF ( do_it ) %]› Acquisitions statistics › Results[% ELSE %]› Acquisitions statistics[% END %]</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="rep_acquisitions_stats" class="rep">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'cat-search.inc' %]
|
|
|
|
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> [% IF ( do_it ) %]› <a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions statistics</a> › Results[% ELSE %] › Acquisitions statistics [% END %]</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
|
|
[% IF ( do_it ) %]
|
|
[% FOREACH mainloo IN mainloop %]
|
|
<h1>Acquisitions statistics </h1>
|
|
[% IF ( mainloo.loopfilter.size ) %]
|
|
<p><b>Filtered on:</b></p>
|
|
[% FOREACH loopfilte IN mainloo.loopfilter %]
|
|
<p>
|
|
[% SWITCH loopfilte.crit %]
|
|
[% CASE '0' %] Placed on (from)
|
|
[% CASE '1' %] Placed on (to)
|
|
[% CASE '2' %] Received on (from)
|
|
[% CASE '3' %] Received on (to)
|
|
[% CASE '4' %] Vendor
|
|
[% CASE '5' %] Home library
|
|
[% CASE '6' %] Collection
|
|
[% CASE '7' %] Item type
|
|
[% CASE '8' %] Fund
|
|
[% CASE '9' %] Sort1
|
|
[% CASE '10' %] Sort2
|
|
[% CASE %] Unknown filter
|
|
[% END %]
|
|
: [% loopfilte.filter | html %]
|
|
</p>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
<table>
|
|
<tr >
|
|
<th>[% mainloo.line | html %] / [% mainloo.column | html %]</th>
|
|
[% FOREACH loopco IN mainloo.loopcol %]
|
|
<th>[% loopco.coltitle | html %]</th>
|
|
[% END %]
|
|
<th>TOTAL</th>
|
|
</tr>
|
|
[% FOREACH loopro IN mainloo.looprow %]
|
|
<tr>
|
|
[% IF ( loopro.hilighted ) %]<td class="hilighted">[% ELSE %]<td>[% END %]
|
|
[% loopro.rowtitle | html %]</td>
|
|
[% FOREACH loopcel IN loopro.loopcell %]
|
|
[% IF ( loopcel.hilighted ) %]<td>[% ELSE %]<td>[% END %]
|
|
[% IF ( loopcel.value ) %][% loopcel.value | html %]
|
|
[% ELSE %]
|
|
[% END %]
|
|
</td>
|
|
[% END %]
|
|
[% IF ( loopro.hilighted ) %]<td>[% ELSE %]<td>[% END %]
|
|
[% loopro.totalrow | html %]
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
<tr >
|
|
<th>TOTAL</th>
|
|
[% FOREACH loopfoote IN mainloo.loopfooter %]
|
|
<th>
|
|
[% loopfoote.totalcol | html %]
|
|
</th>
|
|
[% END %]
|
|
<th>[% mainloo.total | html %]</th>
|
|
</tr>
|
|
</table>
|
|
[% END %]
|
|
[% ELSE %]
|
|
<form method="post" action="/cgi-bin/koha/reports/acquisitions_stats.pl">
|
|
<fieldset class="rows">
|
|
<legend>Acquisitions statistics</legend>
|
|
<table>
|
|
<thead>
|
|
<tr>
|
|
<th>Title</th>
|
|
<th>Row</th>
|
|
<th>Column</th>
|
|
<th>Filter</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
<tr class="hilighted">
|
|
<td>Placed on</td>
|
|
<td><input type="radio" name="Line" value="aqbasket.closedate" /></td>
|
|
<td><input type="radio" checked="checked" name="Column" value="aqbasket.closedate" /> </td>
|
|
<td> From <input type="text" size="10" id="from" name="Filter" value="" />
|
|
<span class="hint">[% INCLUDE 'date-format.inc' %]</span>
|
|
To <input size="10" id="to" name="Filter" type="text" value="" />
|
|
<span class="hint">[% INCLUDE 'date-format.inc' %]</span>
|
|
</td>
|
|
</tr>
|
|
<tr class="hilighted">
|
|
<td> </td>
|
|
<td colspan="2">group by <select name="PlacedOnDisplay">
|
|
<option value="">None</option>
|
|
<option value ="1">Day of week</option>
|
|
<option value ="2">Month</option>
|
|
<option value ="3">Year</option>
|
|
</select>
|
|
|
|
</td>
|
|
<td> </td>
|
|
</tr>
|
|
<tr>
|
|
<td>Received on</td>
|
|
<td><input type="radio" name="Line" value="aqorders.datereceived" /></td>
|
|
<td><input type="radio" name="Column" value="aqorders.datereceived" /></td>
|
|
<td> From <input type="text" size="10" id="fromRO" name="Filter" value="" />
|
|
<span class="hint">[% INCLUDE 'date-format.inc' %]</span>
|
|
To <input type="text" size="10" id="toRO" name="Filter" value="" />
|
|
<span class="hint">[% INCLUDE 'date-format.inc' %]</span>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td> </td>
|
|
<td colspan="2">group by <select name="ReceivedOnDisplay">
|
|
<option value="">None</option>
|
|
<option value ="1">Day of week</option>
|
|
<option value ="2">Month</option>
|
|
<option value ="3">Year</option>
|
|
</select>
|
|
|
|
</td>
|
|
<td> </td>
|
|
</tr>
|
|
<tr class="hilighted">
|
|
<td>Vendor</td>
|
|
<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
|
|
<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
|
|
<td>
|
|
<select name="Filter">
|
|
<option value="">All vendors</option>
|
|
[% FOREACH bookseller IN booksellers %]
|
|
<option value="[% bookseller.name | html %]">[% bookseller.name | html %]</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td>Home library</td>
|
|
<td><input type="radio" name="Line" value="items.homebranch" /></td>
|
|
<td><input type="radio" name="Column" value="items.homebranch" /></td>
|
|
<td>
|
|
<select name="Filter">
|
|
<option value="" selected="selected">All libraries</option>
|
|
[% FOREACH branch IN branches %]
|
|
<option value="[% branch.branchcode | html %]">[% branch.branchname | html %]</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td>
|
|
[% IF ccode_label %]
|
|
[% ccode_label | html %]
|
|
[% ELSE %]
|
|
Collection
|
|
[% END %]
|
|
</td>
|
|
<td><input type="radio" name="Line" value="items.ccode" /></td>
|
|
<td><input type="radio" name="Column" value="items.ccode" /></td>
|
|
<td>
|
|
[% IF ccode_avlist.size %]
|
|
<select name="Filter">
|
|
<option value="" selected="selected">All</option>
|
|
[% FOREACH ccode_av IN ccode_avlist %]
|
|
<option value="[% ccode_av.value | html %]">[% ccode_av.lib | html %]</option>
|
|
[% END %]
|
|
</select>
|
|
[% ELSE %]
|
|
<input type="text" name="Filter" />
|
|
[% END %]
|
|
</td>
|
|
</tr>
|
|
<tr>
|
|
<td>Item type</td>
|
|
<td><input type="radio" name="Line" value="biblioitems.itemtype" /></td>
|
|
<td><input type="radio" name="Column" value="biblioitems.itemtype" /></td>
|
|
<td>
|
|
<select name="Filter" size="1" id="itemtypes">
|
|
<option value="">All item types</option>
|
|
[% FOREACH itemtype IN itemtypes %]
|
|
<option value="[% itemtype.itemtype | html %]">[% itemtype.translated_description | html %]</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
</tr>
|
|
|
|
<tr>
|
|
<td>Fund</td>
|
|
<td><input type="radio" name="Line" value="aqbudgets.budget_code" /></td>
|
|
<td><input type="radio" name="Column" value="aqbudgets.budget_code" /></td>
|
|
<td>
|
|
<select name="Filter" size="1" id="budget">
|
|
<option value="">All funds</option>
|
|
[% FOREACH value IN Budgets.values %]
|
|
<option value="[% value | html %]">[% Budgets.labels.$value | html %]</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
</tr>
|
|
|
|
[% IF ( hassort1 ) %]
|
|
<tr class="hilighted">
|
|
<td>Sort1</td>
|
|
<td><input type="radio" name="Line" value="aqorders.sort1" /></td>
|
|
<td><input type="radio" name="Column" value="aqorders.sort1" /></td>
|
|
<td>
|
|
<select name="Filter" size="1" id="sort1">
|
|
<option value="">All</option>
|
|
[% FOREACH value IN Sort1.values %]
|
|
<option value="[% value | html %]">[% Sort1.labels.$value | html %]</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
[% IF ( hassort2 ) %]
|
|
[% IF ( HglghtSort2 ) %]<tr class="hilighted"> [% ELSE %]<tr>[% END %]
|
|
<td>Sort2</td>
|
|
<td><input type="radio" name="Line" value="aqorders.sort2" /></td>
|
|
<td><input type="radio" name="Column" value="aqorders.sort2" /></td>
|
|
<td>
|
|
<select name="Filter" size="1" id="sort2">
|
|
<option value="">All</option>
|
|
[% FOREACH value IN Sort2.values %]
|
|
<option value="[% value | html %]">[% Sort2.labels.$value | html %]</option>
|
|
[% END %]
|
|
</select>
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table><br />
|
|
</fieldset>
|
|
|
|
<fieldset class="rows">
|
|
<legend> Cell value </legend>
|
|
<ol>
|
|
<li>
|
|
<label for="cellvalue1">Count items:</label><input type="radio" name="Cellvalue" id="cellvalue1" value="1" checked="checked" />
|
|
</li>
|
|
<li>
|
|
<label for="cellvalue2">Count unique biblios:</label><input type="radio" name="Cellvalue" id="cellvalue2" value="2" />
|
|
</li>
|
|
<li>
|
|
<label for="cellvalue3">Amount:</label><input type="radio" name="Cellvalue" id="cellvalue3" value="3" />
|
|
</li>
|
|
<li>
|
|
<label for="cellvalue4">Ordered amount:</label><input type="radio" name="Cellvalue" id="cellvalue4" value="4" />
|
|
</li>
|
|
<li>
|
|
<label for="cellvalue5">Spent amount:</label><input type="radio" name="Cellvalue" id="cellvalue5" value="5" />
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
|
|
<fieldset class="rows">
|
|
<legend>Output</legend>
|
|
<ol>
|
|
<li>
|
|
<label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" />
|
|
</li>
|
|
<li>
|
|
<label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" />
|
|
<label class="inline" for="basename">Named: </label> <input type="text" name="basename" id="basename" value="Export" />
|
|
<label class="inline" for="MIME">Into an application:</label>
|
|
<select name="MIME" id="MIME" size="1">
|
|
<option value="CSV">CSV</option>
|
|
</select>
|
|
<select name="sep" id="sep" size="1">
|
|
[% FOREACH value IN CGIsepChoice.values.sort() %]
|
|
[% IF ( value == CGIsepChoice.default ) %]
|
|
<option value="[% value | html %]" selected="selected">[% value | html %]</option>
|
|
[% ELSE %]
|
|
<option value="[% value | html %]">[% value | html %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
|
|
<fieldset class="action">
|
|
<input type="submit" value="Submit" />
|
|
<input type="hidden" name="report_name" value="[% report_name | html %]" />
|
|
<input type="hidden" name="do_it" value="1" />
|
|
</fieldset>
|
|
</form>
|
|
[% END %]
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'reports-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% INCLUDE 'calendar.inc' %]
|
|
<script type="text/javascript">
|
|
$(document).ready(function() {
|
|
// http://jqueryui.com/demos/datepicker/#date-range
|
|
var dates = $( "#from, #to" ).datepicker({
|
|
changeMonth: true,
|
|
numberOfMonths: 1,
|
|
onSelect: function( selectedDate ) {
|
|
var option = this.id == "from" ? "minDate" : "maxDate",
|
|
instance = $( this ).data( "datepicker" );
|
|
date = $.datepicker.parseDate(
|
|
instance.settings.dateFormat ||
|
|
$.datepicker._defaults.dateFormat,
|
|
selectedDate, instance.settings );
|
|
dates.not( this ).datepicker( "option", option, date );
|
|
}
|
|
});
|
|
var datesRO = $( "#fromRO, #toRO" ).datepicker({
|
|
changeMonth: true,
|
|
numberOfMonths: 1,
|
|
onSelect: function( selectedDate ) {
|
|
var option = this.id == "fromRO" ? "minDate" : "maxDate",
|
|
instance = $( this ).data( "datepicker" );
|
|
date = $.datepicker.parseDate(
|
|
instance.settings.dateFormat ||
|
|
$.datepicker._defaults.dateFormat,
|
|
selectedDate, instance.settings );
|
|
datesRO.not( this ).datepicker( "option", option, date );
|
|
}
|
|
});
|
|
});
|
|
</script>
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|