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>
443 lines
22 KiB
Text
443 lines
22 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE Koha %]
|
|
[% USE KohaDates %]
|
|
[% USE AuthorisedValues %]
|
|
[% USE Branches %]
|
|
[% SET footerjs = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Housebound › Details for [% INCLUDE 'patron-title.inc' no_html = 1 %]</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
</head>
|
|
|
|
<body id="housebound-home" class="housebound">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'patron-search.inc' %]
|
|
|
|
<div id="breadcrumbs">
|
|
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
|
|
› <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
|
|
› Details for [% INCLUDE 'patron-title.inc' %]
|
|
</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
|
|
[% INCLUDE 'members-toolbar.inc' %]
|
|
|
|
<div class="yui-g">
|
|
|
|
<!-- Title -->
|
|
<h3>Housebound details for [% INCLUDE 'patron-title.inc' %]</h3>
|
|
<div class="first">
|
|
|
|
[% FOR m IN messages %]
|
|
<div class="dialog [% m.type | html %]">
|
|
[% SWITCH m.code %]
|
|
[% CASE 'error_on_profile_store' %]
|
|
An error occurred whilst updating this housebound profile.
|
|
[% CASE 'error_on_profile_create' %]
|
|
An error occurred whilst creating this housebound profile.
|
|
[% CASE 'error_on_visit_load' %]
|
|
An error occurred whilst loading the housebound visit.
|
|
[% CASE 'error_on_visit_delete' %]
|
|
An error occurred whilst deleting a housebound visit.
|
|
[% CASE 'error_on_visit_store' %]
|
|
An error occurred whilst updating a housebound visit.
|
|
[% CASE 'error_on_visit_create' %]
|
|
An error occurred whilst creating a new housebound visit.
|
|
[% CASE %]
|
|
[% m.code | html %]
|
|
[% END %]
|
|
Please try again later.
|
|
</div>
|
|
[% END %]
|
|
|
|
<!-- Create or edit housebound_profile -->
|
|
[% IF ( method == 'update_or_create' ) %]
|
|
<h4>Manage housebound profile</h4>
|
|
<form id="editform" method="post" name="editform"
|
|
action="/cgi-bin/koha/members/housebound.pl">
|
|
<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
|
|
[% IF ( housebound_profile ) %]
|
|
<input type="hidden" name="method" value="updateconfirm" />
|
|
[% ELSE %]
|
|
<input type="hidden" name="method" value="createconfirm" />
|
|
[% END %]
|
|
<fieldset id="houseboundentry" class="rows">
|
|
<legend>Housebound details</legend>
|
|
<ol>
|
|
<li>
|
|
<label for="day" class="required">Delivery day:</label>
|
|
<select id="day" name="day" class="required" required="required">
|
|
<option value="">Select a day</option>
|
|
[% IF ( housebound_profile ) %]
|
|
[% IF ( housebound_profile.day == 'any' ) %]
|
|
<option value="any" selected='selected'>Any</option>
|
|
[% ELSE %]
|
|
<option value="any">Any</option>
|
|
[% END %]
|
|
[% IF ( housebound_profile.day == 'monday' ) %]
|
|
<option value="monday" selected='selected'>Monday</option>
|
|
[% ELSE %]
|
|
<option value="monday">Monday</option>
|
|
[% END %]
|
|
[% IF ( housebound_profile.day == 'tuesday' ) %]
|
|
<option value="tuesday" selected='selected'>Tuesday</option>
|
|
[% ELSE %]
|
|
<option value="tuesday">Tuesday</option>
|
|
[% END %]
|
|
[% IF ( housebound_profile.day == 'wednesday' ) %]
|
|
<option value="wednesday" selected='selected'>Wednesday</option>
|
|
[% ELSE %]
|
|
<option value="wednesday">Wednesday</option>
|
|
[% END %]
|
|
[% IF ( housebound_profile.day == 'thursday' ) %]
|
|
<option value="thursday" selected='selected'>Thursday</option>
|
|
[% ELSE %]
|
|
<option value="thursday">Thursday</option>
|
|
[% END %]
|
|
[% IF ( housebound_profile.day == 'friday' ) %]
|
|
<option value="friday" selected='selected'>Friday</option>
|
|
[% ELSE %]
|
|
<option value="friday">Friday</option>
|
|
[% END %]
|
|
[% IF ( housebound_profile.day == 'saturday' ) %]
|
|
<option value="saturday" selected='selected'>Saturday</option>
|
|
[% ELSE %]
|
|
<option value="saturday">Saturday</option>
|
|
[% END %]
|
|
[% IF ( housebound_profile.day == 'sunday' ) %]
|
|
<option value="sunday" selected='selected'>Sunday</option>
|
|
[% ELSE %]
|
|
<option value="sunday">Sunday</option>
|
|
[% END %]
|
|
[% ELSE %]
|
|
<option value="any">Any</option>
|
|
<option value="monday">Monday</option>
|
|
<option value="tuesday">Tuesday</option>
|
|
<option value="wednesday">Wednesday</option>
|
|
<option value="thursday">Thursday</option>
|
|
<option value="friday">Friday</option>
|
|
<option value="saturday">Saturday</option>
|
|
<option value="sunday">Sunday</option>
|
|
[% END %]
|
|
</select>
|
|
<span class="required">Required</span>
|
|
</li>
|
|
<li>
|
|
<label for="frequency" class="required">Frequency:</label>
|
|
<select id="frequency" name="frequency" class="required" required="required">
|
|
<option value="">Select a frequency</option>
|
|
[% FOREACH frequency IN AuthorisedValues.GetAuthValueDropbox('HSBND_FREQ') %]
|
|
[% IF housebound_profile.frequency == frequency.authorised_value %]
|
|
<option value="[% frequency.authorised_value | html %]" selected="selected">[% frequency.lib | html %]</option>
|
|
[% ELSE %]
|
|
<option value="[% frequency.authorised_value | html %]">[% frequency.lib | html %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
<span class="required">Required</span>
|
|
</li>
|
|
<li>
|
|
<label for="fav_itemtypes">Preferred materials:</label>
|
|
[% IF ( housebound_profile ) %]
|
|
<input id="fav_itemtypes" type="text" size="50" name="fav_itemtypes"
|
|
value="[% housebound_profile.fav_itemtypes | html %]">
|
|
[% ELSE %]
|
|
<input id="fav_itemtypes" type="text" value="" size="50" name="fav_itemtypes">
|
|
[% END %]
|
|
</li>
|
|
<li>
|
|
<label for="fav_subjects">Subjects:</label>
|
|
[% IF ( housebound_profile ) %]
|
|
<input id="fav_subjects" type="text" size="50" name="fav_subjects"
|
|
value="[% housebound_profile.fav_subjects | html %]">
|
|
[% ELSE %]
|
|
<input id="fav_subjects" type="text" value="" size="50" name="fav_subjects">
|
|
[% END %]
|
|
</li>
|
|
<li>
|
|
<label for="fav_authors">Authors:</label>
|
|
[% IF ( housebound_profile ) %]
|
|
<input id="fav_authors" type="text" size="50" name="fav_authors"
|
|
value="[% housebound_profile.fav_authors | html %]">
|
|
[% ELSE %]
|
|
<input id="fav_authors" type="text" value="" size="50" name="fav_authors">
|
|
[% END %]
|
|
</li>
|
|
<li>
|
|
<label for="referral">Referral:</label>
|
|
[% IF ( housebound_profile ) %]
|
|
<input id="referral" type="text" size="50" name="referral"
|
|
value="[% housebound_profile.referral | html %]">
|
|
[% ELSE %]
|
|
<input id="referral" type="text" value="" size="50" name="referral">
|
|
[% END %]
|
|
</li>
|
|
<li>
|
|
<label for="notes">Notes:</label>
|
|
[% IF ( housebound_profile ) %]
|
|
<input id="notes" type="text" size="50" name="notes"
|
|
value="[% housebound_profile.notes | html %]">
|
|
[% ELSE %]
|
|
<input id="notes" type="text" value="" size="50" name="notes">
|
|
[% END %]
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<fieldset class="action">
|
|
<button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save changes</button>
|
|
<a class="cancel btn btn-link btn-sm"
|
|
href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | html %]">
|
|
Cancel
|
|
</a>
|
|
</fieldset>
|
|
</form>
|
|
|
|
<!-- Create or edit housebound_visit -->
|
|
[% ELSIF ( method == 'visit_update_or_create' ) %]
|
|
<h4>Manage housebound deliveries</h4>
|
|
<form name="form" id="instance_form" method="post"
|
|
action="/cgi-bin/koha/members/housebound.pl">
|
|
[% IF ( visit ) %]
|
|
<input type="hidden" name="method" value="editvisitconfirm" />
|
|
<input type="hidden" name="visit_id" value="[% visit.id | html %]" />
|
|
[% ELSE %]
|
|
<input type="hidden" name="method" value="addvisitconfirm" />
|
|
[% END %]
|
|
<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
|
|
<fieldset class="rows" id="instance">
|
|
<legend>Delivery details</legend>
|
|
<ol>
|
|
<li>
|
|
<label for="date" class="required">Date: </label>
|
|
[% IF ( visit ) %]
|
|
<input type="text" id="date" class="datepicker required"
|
|
value="[% visit.appointment_date | $KohaDates %]"
|
|
name="date" size="20" required="required"/>
|
|
[% ELSE %]
|
|
<input type="text" id="date" class="datepicker required"
|
|
value="" name="date" size="20" required="required"/>
|
|
[% END %]
|
|
<span class="required">Required</span>
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
</li>
|
|
<li>
|
|
<label for="segment" class="required">Time:</label>
|
|
<select id="segment" name="segment" required="required"
|
|
class="required">
|
|
<option value="">Select a time</option>
|
|
[% IF ( visit ) %]
|
|
[% IF ( visit.day_segment == 'morning' ) %]
|
|
<option value="morning" selected="selected">
|
|
Morning
|
|
</option>
|
|
[% ELSE %]
|
|
<option value="morning">Morning</option>
|
|
[% END %]
|
|
[% IF ( visit.day_segment == 'afternoon' ) %]
|
|
<option value="afternoon" selected="selected">
|
|
Afternoon
|
|
</option>
|
|
[% ELSE %]
|
|
<option value="afternoon">Afternoon</option>
|
|
[% END %]
|
|
[% IF ( visit.day_segment == 'evening' ) %]
|
|
<option value="evening" selected="selected">
|
|
Evening
|
|
</option>
|
|
[% ELSE %]
|
|
<option value="evening">Evening</option>
|
|
[% END %]
|
|
[% ELSE %]
|
|
<option value="morning">Morning</option>
|
|
<option value="afternoon">Afternoon</option>
|
|
<option value="evening">Evening</option>
|
|
[% END %]
|
|
</select>
|
|
<span class="required">Required</span>
|
|
</li>
|
|
<li>
|
|
<label for="chooser" class="required"> Chooser:</label>
|
|
<select id="chooser" name="chooser" class="required" required="required">
|
|
<option value="">Select a chooser</option>
|
|
[% IF ( visit ) %]
|
|
[% FOREACH chooser IN choosers %]
|
|
[% IF ( visit.chooser_brwnumber == chooser.borrowernumber ) %]
|
|
<option value="[% chooser.borrowernumber | html %]" selected="selected">
|
|
[% INCLUDE 'patron-title.inc' patron = chooser invert_name = 0 %]
|
|
</option>
|
|
[% ELSE %]
|
|
<option value="[% chooser.borrowernumber | html %]">
|
|
[% INCLUDE 'patron-title.inc' patron = chooser invert_name = 0 %]
|
|
</option>
|
|
[% END %]
|
|
[% END %]
|
|
[% ELSE %]
|
|
[% FOREACH chooser IN choosers %]
|
|
<option value="[% chooser.borrowernumber | html %]">
|
|
[% INCLUDE 'patron-title.inc' patron = chooser invert_name = 0 %]
|
|
</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
<span class="required">Required</span>
|
|
</li>
|
|
<li>
|
|
<label for="deliverer" class="required">Deliverer:</label>
|
|
<select id="deliverer" name="deliverer" class="required" required="required">
|
|
<option value="">Select a deliverer</option>
|
|
[% IF ( visit ) %]
|
|
[% FOREACH deliverer IN deliverers %]
|
|
[% IF ( visit.deliverer_brwnumber == deliverer.borrowernumber ) %]
|
|
<option value="[% deliverer.borrowernumber | html %]" selected="selected">
|
|
[% INCLUDE 'patron-title.inc' patron = deliverer invert_name = 0 %]
|
|
</option>
|
|
[% ELSE %]
|
|
<option value="[% deliverer.borrowernumber | html %]">
|
|
[% INCLUDE 'patron-title.inc' patron = deliverer invert_name = 0 %]
|
|
</option>
|
|
[% END %]
|
|
[% END %]
|
|
[% ELSE %]
|
|
[% FOREACH deliverer IN deliverers %]
|
|
<option value="[% deliverer.borrowernumber | html %]">
|
|
[% INCLUDE 'patron-title.inc' patron = deliverer invert_name = 0 %]
|
|
</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
<span class="required">Required</span>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<fieldset class="action">
|
|
<button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save</button>
|
|
<a class="cancel"
|
|
href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | html %]">
|
|
Cancel
|
|
</a>
|
|
</fieldset>
|
|
</form>
|
|
|
|
<!-- Display a housebound_profile -->
|
|
[% ELSIF ( housebound_profile ) %]
|
|
<div class="rows">
|
|
<ol>
|
|
<li>
|
|
<span class="label" class="required"> Delivery day:</span>
|
|
[% hpd = housebound_profile.day | html %]
|
|
[% IF hpd == 'any' %]
|
|
Any
|
|
[% ELSIF hpd == 'monday' %]
|
|
Monday
|
|
[% ELSIF hpd == 'tuesday' %]
|
|
Tuesday
|
|
[% ELSIF hpd == 'wednesday' %]
|
|
Wednesday
|
|
[% ELSIF hpd == 'thursday' %]
|
|
Thursday
|
|
[% ELSIF hpd == 'friday' %]
|
|
Friday
|
|
[% ELSIF hpd == 'saturday' %]
|
|
Saturday
|
|
[% ELSIF hpd == 'sunday' %]
|
|
Sunday
|
|
[% END %]
|
|
</li>
|
|
<li>
|
|
<span class="label" class="required">Frequency:</span>
|
|
[% AuthorisedValues.GetByCode( 'HSBND_FREQ', housebound_profile.frequency, 0 ) || housebound_profile.frequency | html %]
|
|
</li>
|
|
<li>
|
|
<span class="label">Material:</span>
|
|
[% housebound_profile.fav_itemtypes | html %]
|
|
</li>
|
|
<li>
|
|
<span class="label">Subjects:</span>
|
|
[% housebound_profile.fav_subjects | html %]
|
|
</li>
|
|
<li>
|
|
<span class="label">Authors:</span>
|
|
[% housebound_profile.fav_authors | html %]
|
|
</li>
|
|
<li>
|
|
<span class="label">Referral:</span>
|
|
[% housebound_profile.referral | html %]
|
|
</li>
|
|
<li>
|
|
<span class="label">Notes:</span>
|
|
[% housebound_profile.notes | html %]
|
|
</li>
|
|
</ol>
|
|
<div class="action">
|
|
<a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | html %]&method=update_or_create"><i class="fa fa-pencil"></i> Edit</a>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<h3>Deliveries</h3>
|
|
[% housebound_visits = housebound_profile.housebound_visits | html %]
|
|
[% IF housebound_visits.size > 0 %]
|
|
<table border="0" width="100%" cellpadding="3" cellspacing="0">
|
|
<tr>
|
|
<th>ID</th><th>Date</th><th>Chooser</th><th>Deliverer</th><th>Actions</th>
|
|
</tr>
|
|
[% FOREACH entry IN housebound_visits %]
|
|
<tr>
|
|
<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 %]">
|
|
[% 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 %]">
|
|
[% INCLUDE 'patron-title.inc' patron = entry.deliverer invert_name = 0 %]
|
|
</a>
|
|
</td>
|
|
<td class="actions">
|
|
<a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&visit_id=[% entry.id | html %]&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-pencil"></i> Edit</a>
|
|
<a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?method=visit_delete&visit_id=[% entry.id | html %]&borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-trash"></i> Delete</a>
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</table>
|
|
[% END %]
|
|
<div class="action">
|
|
<a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% patron.borrowernumber | html %]"
|
|
class="btn btn-default btn-sm">
|
|
<i class="fa fa-plus"></i> Add a new delivery
|
|
</a>
|
|
</div>
|
|
</div>
|
|
|
|
[% END %]
|
|
|
|
</div> <!-- End yui-u first -->
|
|
</div> <!-- End yui-g -->
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'circ-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
|
|
[% MACRO jsinclude BLOCK %]
|
|
[% INCLUDE 'calendar.inc' %]
|
|
<script type="text/javascript">
|
|
|
|
$(document).ready(function() {
|
|
$("a.delete").click(function(){
|
|
return confirm(_("Are you sure you want to delete this delivery?"));
|
|
});
|
|
});
|
|
</script>
|
|
[% INCLUDE 'str/members-menu.inc' %]
|
|
[% Asset.js("js/members-menu.js") | $raw %]
|
|
[% END %]
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|