Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b39466c965)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 306871578e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Not part of the bugfix per se, but taking this chance
to clean up some inconsistent tabbing.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2e963dc416)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Offline circ no longer tries to calculate the due date
directly, instead relying on the AddIssue and AddRenewal
APIs to do so. This corrects a bug where the due date
would be calculated incorrectly if the item-level_itypes
system preference is turned on.
This change also has the effect of causing the issue date
for loans uploaded via offline circulation to be set
to the time stamp recorded by the offline circulation client.
Test plan:
* Turn on item-level_itypes
* Create an example item whose loan policy per
the item's item type would be different from
the default policy based on the bib-level type.
* Create a test KOC file with a loan of the test
item and the checkout date artificially set
to yesterday.
* Upload the file:
- Before the fix, the due date would be set
to the default due date. Also, the issue date
will be set to the date of the upload.
- After the fix, the due date would be calculated
correctly based on the item's item type. Also,
the issue date will be set to the date recorded
by the offline circulation client.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 935635aba5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Reimplements support for -r, as well for -reset
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8dc56a0d2c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d6718e14e7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c84dad3b18)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
this fix filters of borrowers top issues that doesn't work really well... perhaps because reports scripts need too much improvment.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6b285cf44d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Correcting check for circulation permission. Also updating
updateitem.pl (for setting lost and damaged statuses) with
circulate permissions.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7a587112f0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Reimplementation of Nahuel's patch from 2010-03-02
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0ba9aab76b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit dbe3780fc0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The variable name for the current branch being edited was the same as the variable used in
cat-search.inc, which passed along the circ-rule library to circulation.pl, and then overriding
the set library from there.
This patch renames the template variable 'current_branch', so that it does not populate the 'branch'
param in cat-search.inc
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4735e296cf)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Calendar picker JS can't come before main JS includes
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2dde876798)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Field enumchron in items table is now varchar(80).
We have records that need a much longer field, even up to 400 or 500 chars.
I suggest to change its type to TEXT (variable length with max 64K; tinytext
goes up to 255 chars and is just too short).
Mediumtext or longtext are not needed; as a side note these types are used in
the items table for e.g. booksellerid and more_subfields_xml..
Revised original patch thanks to Ian Walls: update kohatructure.sql. Copied the change in deleteditems as well.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fca88d102b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 87ec412648)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 19adf162ca)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bbd08ffd09)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6ded7b9897)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The fix for 3319 overwrote the @branchloop variable with output from GetBranchesLoop,
which forces a selected branch. Removing the extra call, and just measuring the size of
@branchloop as it was build, plus some dereferencing, fixes the issue.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Fixing: Undefined subroutine prepare called on line 722.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 439d2224e1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Modifying empty cart function to take a paramter: if true,
cart will be emptied without a prompt.
Removing unnecessary "javascript:" pseudo-protocol.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 61f6828d12)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit edafbd941d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fix for Bug 5551 overwrote the necessary changes to opac-detail.pl
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit baec90aae9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Small correction of e umlaut. [Something happened with encoding of signed patch; my original patch did not show a wrong character.]
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 575a690b4e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch addresses both security issues mentioned in the summary of the report
submitted by Frère Sébastien Marie included below.
---------------------------
The problem is here: 'C4/AuthoritiesMarc.pm' in the function 'DelAuthority':
The argument $authid is included directly (not via statement) in the SQL.
For the exploit of this problem, you can use 'authorities/authorities-home.pl'
with authid on the URL and op=delete (something like
"authorities/authorities-home.pl?op=delete&authid=xxx").
This should successfully call DelAuthority, without authentification...
(DelAuthority is call BEFORE get_template_and_user, so before authentification
[This should be an issue also...]).
Please note that the problem isn't only that anyone can delete an authority of
this choose, it is more general: with "authid=1%20or%1=1" (after inclusion sql
will be like: "delete from auth_header where authid=1 or 1=1") you delete all
authorities ; with "authid=1;delete%20from%xxx" it is "delete from auth_header
where authid=1;delete from xxx" and so delete what you want...
SQL-INJECTION is very permissive: you can redirect the output in a file (with
some MySQL function), so write thea file of you choose in the server, in order
to create a backdoor, and compromise the server.
Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b0f60221f4)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Follow up patch. Improvement suggested by Belgian translators (Hans Supply).
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fc1b7201c5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
- Adding title, subtitle, and author to output
- Reworking display of shelving location selection
Patch does not address the contents of 'overdue status' and 'notified by'
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 50c0ae09a1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2f9bebf802)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This reverts commit 65e478ca51.
Patch accidentally pushed which introduces string changes.
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This reverts commit 211dae9f01.
Patch accidentally pushed which introduces string changes.
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This reverts commit 3176055652.
Patch accidentally pushed which introduces string changes.
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a0367aa973)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1f0e0c5de1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This allow also Save button label translation
[3.2] It applies
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit eaf4cfe6b8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
POD was mistakenly telling that NFD was supposed to be the default
encoding. In fact, it is not, it is NFC.
So the variable $nfc to change to the not default encoding was misleading.
Renaming it into $nfd
(written by hdl)
Refactored by Chris Cormack
Signed-off-by: Davi <davi@gnu.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4117b293f6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Disabling that part of the calendar JavaScript which hides
<select> form fields when the calendar is displayed. This is at
the expense of IE6.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fb5ede8b59)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédérick Capovilla
Chris Cormack
Paul Poulain
Galen Charlton
Ian Walls
Nicole C. Engard
Reed Wade
Nahuel ANGELINETTI
Owen Leonard
Chris Nighswonger
Marcel de Rooy
MJ Ray
Robin Sheat
Chris Nighswonger
marcel@libdevelop.rijksmuseum.nl
Frédéric Demians