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 c84dad3b18)
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>
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>
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>
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>
- 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>
This reverts commit 65e478ca51.
Patch accidentally pushed which introduces string changes.
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>
- 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>
XSLT.pm add few syspref to MARCXML record send to be transformed by XSLT. If
one of those syspref doesn't exist, it generated a warning.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bfec5ef4c1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Merge of bug 4263 duplicates the bulk of
ModItemFromMarc causing compile time errors
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1a0b6ded11)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Squashed commit of the following:
commit 66cdb8804136803a3f626d183c8f192f61f3c7b1
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date: Fri Feb 4 12:55:10 2011 +1300
Bug 5691: Updating copyright statement
commit 79ef6c269afc9c644c51709a7657542a0fc6d7d6
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date: Fri Feb 4 12:52:13 2011 +1300
Bug 5691 - Fixing a syntax error and tidying up some formatting
commit a66485dba113c05ed51a3b4ff19f788e335aa1f6
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date: Tue Oct 5 17:23:55 2010 +0200
(MT #1365) Delete all items
Using DelItemCheck in cataloguing/additem.pl
when deleting all items
commit fe845fd48ab22ff82ad6d8971c468c327b49f3c4
Author: Christophe Croullebois <christophe.croullebois@biblibre.com>
Date: Wed Sep 22 11:39:28 2010 +0200
(MT #1365) Delete all items
Now if IndependantBranches is on and a user try to delete all items, only the items of his branch will be deleted.
A message explain this fact.
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Followup: (MT #1365) Fixing up the English idiom
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a4cc394508)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
MT3947: items.timestamp were not updated on edition
If items.timestamp is used in the framework and hidden
the fact that it is NOT deleted before update is done would input the previous timestamp,
which is not the desired behaviour.
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 60dd25b5c2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
When Creating a new biblio record, if the cataloguer doesn't use the leader
plugin, a biblio record can be saved with a leader not containing a 'a' in 9
position. If the biblio contains UTF-8 characters, its decoding can fail.
This issue applies to MARC-21 not UNIMARC.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f1f36a0c94)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Items created as part of the acquisitions process, and assigned the temporary notforloan value of -1,
cannot be placed on hold from the search results in either the OPAC or staff client (the link is missing).
This patch changes the evaluation of items->notforloan from a Boolean (if $items->{notforloan}) to a comparison
(if $items->{notforloan} > 0). Any notforloan status with a negative value can therefore be reserved.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f692123bf1)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Squashed commit of the following:
commit f441094d5095d165eab18340c983a831cce8f6e0
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date: Mon Jul 5 20:33:23 2010 +0200
bug4263 followup : Can't blank subfields
Previous bug4263 reintroduced bug 2466: fix clearing item field
This keeps bug4263 followup to be assigned (donot blank dateaccessioned)
But also allow to blank item subfields.
commit 92889b766c41b48bdd0e3a33ca4b183b1e259805
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date: Fri Apr 23 13:54:30 2010 +0200
(bug #4263) dateaccessionned is cleaned on item modification
Every item modification, date accessionned is cleaned, if there is no modification made, we must'nt reset to "undef" the value.
commit 5abb2db16b2564d32e84b7cc680acbc301d73179
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date: Tue Mar 2 09:57:33 2010 +0100
(bug #4263) fix the edition of items with repeatable subfields
The subfield management in item level is broken, fields are concatenated in one field, and if the librarian edit it, the values are not selected.
This big patch fix three things:
1) saving fields that are stocked in SQL(using koha2marc mapping) are now well cut and separated in _REAL_ subfields
2) loading records with repeatable subfields are now well returned
3) Editing items with repeatable fields works well
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Bug 4263 Removing extranious block of code
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit aa398ed055)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Squashed commit of the following:
commit 105de81639cbac5084e4a5c099b19569043e69ff
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date: Tue Jul 13 11:58:01 2010 +0200
(bug #4931) fix forgottens input in buttons
the previous patch missed an hidden input in next buttons that break next page. This fix it.
commit db00295a6b9d1d36fc888ba6a0558011fd6884ba
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date: Fri Jul 2 15:27:59 2010 +0200
(bug #4931) add the ability to choose home or holding branch in stocktaking
This add radio box in stocktaking to base it on home or holdingbranch
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Bug 4391 Followup: Adding back lost declaration of $branchcode
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 35b47b6ff7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 079796ed18)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
From Biblibre:
I don't know why, but removing sprintf solves the problems with leading zeroes
and the problems with large values.
(written by jean-andré santoni)
Note from Chris:
The width is never set, so the sprintf always defaults to a float, which
trims the leading zeros. I am not smart enough to figure out how to set
a valid width when calling it, and removing the sprintf seems to work
See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5681 for
test results
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4f7bcdcbae)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch makes it impossible to save records with variables fields that don't
contain any subfields. Prior to this patch, link_bibs_to_authorities.pl would
sometimes corrupt records.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 428556cd13)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
These two subroutines were no longer being used by any other code
removed them from their respective modules
If we need any ISBN in future we should use Business::ISBN directly
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a61db4986d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Squashed commit of the following:
commit 146d14665c52edaa85e38b70aabc9d52be5d64b6
Author: Zach Sim <joseph.zachariah.sim@gmail.com>
Date: Mon Jan 17 16:07:24 2011 +1300
Edited DisplayISBN to cleanup the ISBN using _isbn_cleanup if it is not 13 or 10 digits long.
commit ba97b26d9a25470b0717cdd60a3d4f7a5c459ca9
Author: Zach Sim <joseph.zachariah.sim@gmail.com>
Date: Mon Jan 17 16:06:14 2011 +1300
Added extra unit tests to test C4::Koha::DisplayISBN.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 53a301b8f2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Fixed by doing a pretty dumb copy of GetMarcNotes. Functional,
but it could be there is a more efficient way to do it given
we want one repeating tag rather than a range of tags?
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- fixed small typo in opac-detail
- corrected isbd punctuation in opac-detail
- tested with 0, 1, 2, 3 isbns in 020, MARC21
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Remove the unneeded package variables
Remove unnecessary variables
Removed some cargo-cult programming
Tidied the indentation from mix of tabs & spaces
Add a Test that we actually return the required class
of object
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 073fb1aee6)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Per module INIT Blocks are not run in mod_perl so their
variables are not visible. A lexical var is adequate
for this purpose
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e0d76bd88d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
item duedate is not a datetime entity but a string retrieved
direct from the db that only needs restructuring
checkout was doing so but item_info was pretending it was in secs
(actually Item.pm manipulated then overwrote it!!)
assume the date in the db is correct (otherwise madness ensues)
dont try to second guess it
As duedates do not yet include a time element assume end of day
as a safety first
[F. Demians] I confirm Joe Atzberger diagnostic. That's a bug reported by a
library. I've tested Colin Campell solution. It fixes the bug.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d4842d4560)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Changings one of the LEFT JOINS in C4::Members::Messaging::GetMessagingPreferences
to a JOIN to prevent NULL message_transport_types from being returned
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8185db4787)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Rather bizarrely Suggestions.pm was setting up @EXPORT, @ISA
and $VERSION twice. Have removed one invocation
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d1172b98d9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
The item type which shows on other editions is the biblio-level
itemtype. XISBN.pm had some item-handling code, but I'm
removing it because it is unused. The editions tab should
now display item type only if item-level itemtypes are not
enabled.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bbd50b2d12)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Changes to list contents view to make it consistent with search results
My intention is to make the OPAC more consistent in the way it displays
lists of items, whether it be in search results, lists, etc. This patch
adds data to the list contents output and reformats it to that end.
The other significant change is the removal of jQuery table sorting.
Since list contents are both sorted and paginated on the server
side. Adding a client-side sort to one page of many doesn't make sense.
Other changes include:
- Change "Your lists" to "Your private lists"
- Remove "sort by" column because it seems unnecessary
- Adding logic to control display of count (item or items
rather than item(s)
- Styling pagination bar and placing at the bottom of the page,
consistent with other instances of pagination navigation
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Update 005 date/time when saving authority record for MARC21 and UNIMARC.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1190833149)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Currently, the plugin marc21_field_005 and its unimarc opponent fill field 005
when this field gets focus. This implies that updating a record without
touching this field does not update 005.
At the same time, a user could accidentally delete a character in the 005 when
having focus. This mutilated field value will be saved however.
I would suggest to add a few lines to ModBiblioMarc in Biblio.pm to ascertain
that adding or updating a record always updates 005 in marc21 as well as
unimarc.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 76338220dd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cdbf872bd5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 79fb4a8134)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This patch improves the phrasing of several messages by
breaking the message variable into distinct parts for more
natural-sounding warnings when:
- Checking out an item on hold for another patron
- Checking out an item which is waiting for another patron
- Checking out an item which is checked out to another patron
- Checking out an item which is checked out to this patron
- Checking out to a patron who has too many checked out
I would appreciate special attention to my changes to the
TooMany function in Circulation.pm to make sure I handled
it correctly.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 324991fefd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Prevents inactive funds from showing in the aquisitions module, they
still show in the administration.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 00dd0ae627)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Raise warning rather than disallowing
Remove due date js validation when checking out
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small error in circulation.tmpl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4d1762f5ec)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
lexical variable declared twice causing run time warnings
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 51dc5b060b)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This adds display of "Use restrictions" authorized values
to the OPAC and the staff client for available and
not-for-loan items.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bdf4dd13af)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
On the Check Out page, messages related to the borrower are displayed on the
right side. Message text is preceded by a date and library code. The date is
displayed in US format (mm/dd/YYY). Is should be displayed formated depending
on 'dateformat' syspref.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 37a17d8fad)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>